Merge branch 'sidebar-fixes'
fixed old layout issue
Merge branch 'master' into sidebar-fixes
emergency fix so capsules/new doesn't crash
Merge branch 'master' into sidebar-fixes