Sidebar fixes

A punch of fixes for the new sidebar.