major layout revisions