Cleanup and adding reset button