Gmaps

also update the UI some more