CMS-1354 App apps - Adjustments to tab selector