Update to be inline with UITabBarController

changes to be more inline with UITabBarController API