Fix tab ordering