Global only option
Fix bug with wrong dashboard being selected
Merge pull request #581 from benrudolph/master

Small updates