Updated tab control