[#64856172] Change layouts

Implemented