Revert "fix layout"

This reverts commit 7d3f9c853e772776bde88dec750af676d552f0e4.
Revert "Revert "fix layout""

This reverts commit d1f37e4095f7c1b046b8dfd1b32871fe534bf80a.