* Re-factor tab bar
* Another tweak to menu positioning