Added reset button
Some more cleanup