Improve all design