Fix layout for order screen on dashboard
Merge branch 'develop' into feature/quantity-discount