ECMS-5158 Improve the UI in case many tabs