Revised the menu system so it isn't a nested menu for a single item anymore