Fix some regressions
Fix popup window positioning