Misc updates around loadFromStoryboard, and viewController removal from the navstack.