Changing to new save/cancel buttons. Adapting order template for 2.0.