Fix bug : #334
Tracking dashboard info #328
Refactor a bit