added location searchbar and gets current location
fix merge issues after pull from kenneth