add reset button
Merge branch 'testing'