LP#2000482: (follow-up) couple more layout tweaks