Merge pull request #79 from Chunjie/master

[PT 47858221 & 47858085] dashboard implementation