Fix button mapping