Layout

Merging in layout changes to the main page