Renames 'messages' to 'popups' and adds popup container