Finish Issues #16 and #17

Issue #16 and Issue #17 have been completed and the new real-time menus
work well.