Fix bindings, widgets