Fix image location, add popups to edit page