Refactored some issues in report helper and viewer
Merge branch 'master' of https://github.com/EdgeComputing/cats
Merge branch 'master' of https://github.com/EdgeComputing/cats