broke scripts in different files
added condition so that report always showed after submission button
Merge branch 'development' into development-raihan
Merge branch 'development-raihan' into development