Refactor on Sidebar