Fixed up button mapping