Style and HTML structure improvements