Add smart tabbing