Fix design and setting catalog