css cleanup and refactoring for branch changes