Fixes #70 and edit/destroy button display

I have tested this on my 1-3-stable branch and it fixes #70.

There are still major problems with how variants are handled in New Order.