Restored menusystem functionality to original

Failed attempt at the non-blocking implementation.  Restoring it to a
working state.  Will attempt non-blocking implementation later.