tidy up controller
added cancelling, continued with editing but disabled for now