A lot of CSS changes
merged