Added reset button, change edit behavior