Added cancelling and saving order
Fix conflict in MenuTemplate