[#76658578] Minor layout changes