Upgaded tabs functionality