get them tabs in order
Merge branch 'feature/tabs' into version/2.0.0