Fixes to the widget to handle bindings