reset button working
merge in new style