Further layout revisions