Menu system updates, refactoring