Move more logic from the menu screen into the Menu object. (dm)