Revert "Layout adjustments"

This reverts commit 5f576c2cf7be59a871a33b4efe5ba93b48ec155a.

Git revert