Feature/cleanup popups