refactoring css and views