simplify order screen
Merge branch 'uicleanup' into foodcoop-adam