Dashboard issue fixes
Merge pull request #849 from lingalamadhukar/bug_fixes

Dashboard issue fixes