refactor some javascript
updated active users report
clean master
updated report
updated reporting