cleaning up ui, user orders, order details
cleaning up ui, user orders, order details, merge resolved