Various fixes.  Nav controller, flyout functions, and app model all play nice again.