Improved new and edit forms