Sidebar improvements. fixes #2