Feature/sidebar improvements