Tidy up menu 

And start development of Navigation window - working out how to buiild windows using "standard" code