Feat/marcopolo tab improvement