Revert "new layout"

This reverts commit eb42d6de85157cd88c60f1593a0bcb9106abaa0c.
Revert "Revert "new layout""

This reverts commit c0e07c8a053ede13a960aa245d56ea274e0c2576.