Fix edit boxes to use two way data binding