Integrated CSS changes

Yay!