Start refactoring to DRY up the CSS