Updated CV to use CV layout