Sidebar refactor