Make design improvements