Fixes to html structure