last changes for popup window