css/html refactor