Revert "update layout for 3.0"

This reverts commit f5a40ab5c2eb8538c39c895b949c4048cb636701.