Completely refactored popups