Updated layouts for v11

Layout for v11 all done.