Fix cv layout