Making a move now causes the user to be switched. Also fixed button enable/disable.