changed popup's content and ismariclar's edit