Small changes. Bug fix on order screen