Cleanup, get correct text info for popups