Updated with better tab locations