Fix some popup and text