back to three button save option
checkout refactored to one controller