Accidently removed some styles in the merge