Changed button numbers to retain positions on new controller