more null bug fixes and progress on Add Device Popup