Refactored popup messages