Updated the device cell layout