Fixed a wrong redirect and improved labels on an edit form.