sidebar refactored