Revert "some layout adjustments"

This reverts commit 93ba3da2d0553d51b39277dfc5dadf5443e2a1b2.
some layout adjustments