Updated for tab layout arrangement