Few changes in order pages
Various changes
Merge branch 'master' of github.com:DDeis/Windmeal