Got rid of the Menu class.  Just have nested Screens.