Revert "Cleaning up layout"

This reverts commit badca3109a81385a31e9c7d67e5f12ad76cd9ab2.