Added edit buttoms, and error messages