Sidebar revisited, cleaned up