Fixed: Blank screen if deviceName already stored.
Multiple improvements