Changes

Reset button functionality
and other issues