Max-width layout
Merge branch 'fixed-width-layout' into dev