Fix forms and added proper editing buttons.