Changed to Number Picker for moves, added Undo Penalty