Sidebar improvements (untested)