Changes...

Rebase Devices.html and update index.html