fixed new/edit controllers