                 
                 // TODO (chiedozi): Do i need to null out the properties on navigator?  Applicaiton does.
 //                navigator.removeEventListener(Event.COMPLETE, persistViewData);
-                navigator.removeEventListener(ViewNavigatorEvent.VIEW_ADD, navigator_viewAddHandler);
+                navigator.removeEventListener(ElementExistenceEvent.ELEMENT_ADD, navigator_viewAddHandler);
             }
         }
     }

        }
        
        
        protected function navigator_viewAddHandler(event:ViewNavigatorEvent):void
        {
            var view:View = event.view;
            
            if (view)
                view.setCurrentState(view.getCurrentViewState(isLandscape), false);

    //--------------------------------------
    
    /**
     *  @inheritDoc
     */
    [Event(name="applicationPersist", type="mx.events.FlexEvent")]
    
    /**
     *  @inheritDoc
     */
    [Event(name="applicationRestore", type="mx.events.FlexEvent")]
    
