Fix button mappings