(NOT READY) [#67523272] Apply grid-layout following design alignment