Added ModalWindow and TipWindow