Version3

Layout corrections