#73791966 create instance variable and use them in reports, fix some designing issues