fix popups
merge