Menu completed.  A few bugs found and fixed.