PopUp Window Improvement