NXP-14855: Update labels and move connect ID to bottom