Disabled two way binding on edit form, general bugfixes