added save form, fixed buttons and worked out user flow