Misc CSS changes and cleanup