Various CSS changes
Resolving merge conflict
Bleh