Sidebar behaviour fixes