More styling and html refactoring