Refactor/sidebar