Device Manager UI review fixes