Fix imports
Update the view to make bindings easier