Minor layout fixes
html fixes
More html fixes