refactored navigation to allow popovers