Fix tab ordering

Fixes #15