Added form for New and Edit actions