More Sidebar Fixes