Moved towards naviframe for non-popup windows