Fix issues arising after re-ordering tabs

Fixes #14