Layout tweaks, fixes in html
Merged layout