Order message fix
Orders small styling
Merge branch 'dev'