I would let as it is for now since we need to redesign the modal dialog part