Adapt design a bit