Done with device page
Merge pull request #46 from rickcarlino/master

May 21st