location services and some styling
merge conflicts