Fixing more of the styles