Reimplement Device Cards

- Fixed various regressions keeping devices from showing up