CMS-1671 Create reusable TopBar - refactoring