finished refactoring css and html