Refactored menu into a couple of value-objects.