DS-9999: fixing close modal button confusion