Revert "Layout change"

This reverts commit 87a22fc4f99a40ee9453cf33550d62bda0e06d14.