Updated vim tab handling