Added 'save and new' button and modified 'cancel' button functionality