css/html refactoring