tab bar nav
Merge branch 'make-tabs-look-like-tabs'