PopUp almost done