Device Updating

Fixes:
 * Devices are updating correctly
 * Fixed Bug with Device duplication in Dashboard