Layout and composition

Layout and composition