Revert "fz's layout"

This reverts commit abbaacb69651cd91b282f9a69175c2384d2c75db.