Did some more work on the menu system