Fix watch bugs, hide step button when it can't be used