More improvement on ModalBox