Refactoring
Renaming popup to edit for better clarity and consistency