fixed new and edit