refactoring css, in progress