Revert "New layout customizations"

This reverts commit cf2955ed5fb90ba1ebf3078242ba93310bd7fbb5.