[#76658578] Layout change