Moved all popups to User Controls.