Layout improved and a couple of types