fixed pop-up borders and btns