Fix form editing