Fix popup window layout
Merge remote branch 'origin/master'