UI-3233: [PLF] Alignment Bugs on some screens