Updated Location

Now using seperate fields for the location adress