Better Class Diagram

Major Changes to MenuItem stuff.