Fixed button problem, reset problem remains
Revert "Fixed button problem, reset problem remains"

This reverts commit 1abab988ee00ff79d1fdae651a803fa852028cc4.