Added base CSS and geolocation
Merge branch