Fix design a bit