Sidebar now toggles with main
Fixed merge conflict
Rebuild after merge conflict