Cleanup #2

Began making the CSS less redundant.