Why don't you make it so that after the fight with a monster, you automatically move to that space? I see no tactical reason for you to remain in the space you were previously in, if you clicked on a monster to move to that space.
While the reset upgrades button works as planned, it actually removed a couple of my weapons. The left and right bumpers no longer show up after I reset the upgrades.
 "Landor Quest"){kind=icon}
 "This is the Only Level"){kind=icon}
 "Ragdoll Achievement 2"){kind=icon}