Fixed the reset form issues. Closes #34