[#49151933] Small layout tweaks