Added close buttons on pop-ups