Update styling to be closer to spec