New version with edit in popup