fix design and map