Refactoring sidebars