Revert "layout fix"

This reverts commit 9055c665ca53459e73b83dcc7c942a8b5af4526c.
Layout fixed