Popup stylefix
Merge branches