Gene's navbar/device count changes.
Merge pull request #44 from optopus/gene/additions

Gene's navbar/device count changes.