fix defects on report creation page
merge files + fixes