Updated reset button and some enhancements