Revert "Wat lay-out changes"

This reverts commit 65cc88190d0e009f7aaa124a347372d2a442a84a.