update design to remove issues