Added Update GUI and more device support