PopUp Layout improvements