Finishing work on the Menu system