Fix design and Code