Improve new layout

List: https://docs.google.com/document/d/1-PqmjmYOwrrCfwxv2dLrAmciUOlx5Zxi1-X1Po2ex04/edit?tab=t.0