Tidy up order data model and layout of checkout controller