modal window improvements

bug when doing an in-modal screen selection and then opening from menu