CMS-970: Top Bar - Improvements to tab selector