Final touches on episode state: fix selection and tidy up menues