Added UINavigationController and other stuff