fix design and some design