Two layouts - sidebar fix
Merge branch 'layouts'