css and html refactored