more order ordering, and work around rails/rails#10303
Merge branch 'uicleanup' into foodcoop-adam-new