css refactoring and simplification
css refactor- merge
commit