Merge pull request #44 from rickcarlino/master

May 18th
Merge pull request #45 from rickcarlino/master

May 19th
Done with device page