Fix button function binds