Clean up sidebar toggling. Also fix map button not collapsing sidebar.