Refactored sidebar