More bug fixes on dash board
Merge pull request #33 from danisaurus/feature-toggle-monitor

More bug fixes on dash board