Made various changes to Devices page and device details page