Added edit func + form