Skeleton of the Vertex + layout fixes