Refactored Sidebar