Tabbar Delegate bug fixes