CSS cleanup and breakout into multiple files