Moved URL values  to settings files
Some cleanup of edit method  and changes for retrieving URLs from settings files.