Menu links page 2

I don't really think the plugin and entity forms should be expected to align.  The change you suggested makes sense - I think we'll just have to live with and extra set of methods on the one form class so that ti can do double duty.