[#58511586] minor layout changes