Added reset button and small fixes