Updated tab behavior