Fix up button mapping