Clean up - get menus correct - mode correct - trying for prime time

This check in represent changes made to provide a more functional
application for users. The state changes may not be completely tested so
beware.