Popups made scalable correctly