Updated styling to match design
More style updates