Tidy up form and add save action.