Silly bugs!
Simplify url and edit_url
Add location in instructory email