Revert "test new layout"

This reverts commit 63cf735c25813a36a8b6f6672a3058d339105587.