fixed sched placement
move sidebar
layout
Merge branch 'sidebar'
fix conflicts