Updated tab behaviour