UI fix for debugging on device, part 2