fix Design issues