Merge pull request #401 from thasti/fix_device_order

Reorder "Device Details" Sections