Merge pull request #42 from optopus/new/new-devices

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

Gene's navbar/device count changes.