Fix typos and popup positioning