added navigation, refined show/close methods