Change design a bit