Feature/order details rewrite

Merging #1138