Moved around stuff in base-theme.css to make more sense