total sidebar refactoring