Adding reset button, fixing references to features