adddevice screen issues fixed