Refactored
Popups now as new classes