Merge branch 'dev' into homepage
Reformat site layout
Merge branch 'homepage' into dev