Various fixes to view and controller 2
Changes to views dialog and small fixes to controller
Fix to view