Improved popup design and texts