refactor sidebar (CO-822)