Make the menu html serializer pass LI items through as-is
Switching message type for auto-generated forms
Resolving conflict