repair some design and layout