+ chanfe structure of report, some changes in views