Refactored the device interface to look more like the mockups