Basic CSS style changes
Merged in CSS changes