Improved layout of orders