Improvements to labeling of menu items; Changes to models to enforce relationships