More improvements to html structure