[#58511632] minor layout changes