Adding some additional logic for the device removal and fixed the UI for the empty device lab scenario