Revert "Layout changes fixed some spacing"

This reverts commit 57d97dace61391124c98e1692bb6a1b5545d45f2.