Sidebar Improvements

as requested.