Fix order list display
Merge branch 'master' into deploy

* master:
  Fix order list display