UI improvements. Fixes.
minor
Merge branch 'master' into dev
fix for order
order upd