Updated layout around the site
Merge branch 'JonM' into dev