add site location in settings
tidying up
tidying some some