Added more stats and fixed the layout and some of the queries
Merge branch 'hot_fix_3_1_1' into develop
Merge branch 'develop' of github.com:unepwcmc/SAPI into develop