Changes to style and html structure