Some updates and fixes to html layouts.