Fixed button problem, reset problem remains