diff --git a/index.html b/index.html
index fb356a9..80d9543 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 
-    <title>IndyConnect</title>
+    <title>Conveyal Analysis</title>
 
     <link href="assets/index.css" rel="stylesheet">
   </head>
diff --git a/src/actions/browsochrones.js b/src/actions/browsochrones.js
index 8d75c3c..235c7cf 100644
--- a/src/actions/browsochrones.js
+++ b/src/actions/browsochrones.js
@@ -17,7 +17,8 @@ import {
   setEnd,
   setEndLabel,
   setStart,
-  setStartLabel
+  setStartLabel,
+  updateMap
 } from '../actions'
 
 import type {Store} from '../types'
@@ -42,8 +43,14 @@ export default function initialize ({
     ),
     geocodeQs({geocoder, qs}).then(([start, end]) => {
       const actions = []
-      if (start) actions.push(setStart(start))
+      if (start) {
+        actions.push(setStart(start))
+        actions.push(
+          updateMap({centerCoordinates: lonlat.toLeaflet(start.latlng)})
+        )
+      }
       if (end) actions.push(setEnd(end))
+      if (qs.zoom) actions.push(updateMap({zoom: parseInt(qs.zoom, 10)}))
       actions.push(
         fetchGrids(browsochrones)
           .then(grids =>
diff --git a/src/components/application.js b/src/components/application.js
index 0b9de8d..1c42139 100644
--- a/src/components/application.js
+++ b/src/components/application.js
@@ -114,13 +114,7 @@ export default class Application extends Component<void, Props, State> {
     return markers
   }
 
-  _setStart = ({
-    label,
-    latlng
-  }: {
-    label?: string,
-    latlng: Coordinate
-  }) => {
+  _setStart = ({label, latlng}: {label?: string, latlng: Coordinate}) => {
     const {browsochrones, map, mapMarkers, timeCutoff, updateStart} = this.props
     const endLatlng = mapMarkers.end && mapMarkers.end.latlng
       ? mapMarkers.end.latlng
@@ -153,13 +147,7 @@ export default class Application extends Component<void, Props, State> {
     }
   }
 
-  _setEnd = ({
-    label,
-    latlng
-  }: {
-    label?: string,
-    latlng: Coordinate
-  }) => {
+  _setEnd = ({label, latlng}: {label?: string, latlng: Coordinate}) => {
     const {browsochrones, map, mapMarkers, updateEnd} = this.props
     updateEnd({
       browsochronesInstances: browsochrones.instances,
@@ -221,10 +209,10 @@ export default class Application extends Component<void, Props, State> {
       <div>
         <div className='Fullscreen'>
           <Map
+            active={browsochrones.active}
             centerCoordinates={map.centerCoordinates}
             clearStartAndEnd={this._clearStartAndEnd}
-            geojson={map.geojson}
-            geojsonColor={browsochrones.active === 0 ? '#4269a4' : 'darkorange'}
+            isochrones={map.isochrones}
             markers={markers}
             pointsOfInterest={pointsOfInterest}
             setEnd={this._setEnd}
@@ -275,7 +263,9 @@ export default class Application extends Component<void, Props, State> {
               actionLog &&
               actionLog.length > 0 &&
               <div className='Card'>
-                <div className='CardTitle'>{messages.Log.Title}</div>
+                <div className='CardTitle'>
+                  {messages.Log.Title}
+                </div>
                 <Log items={actionLog} />
               </div>}
           </div>
diff --git a/src/components/form.js b/src/components/form.js
index 523b616..58b0e81 100644
--- a/src/components/form.js
+++ b/src/components/form.js
@@ -50,7 +50,9 @@ export default ({
   start
 }: Props) => (
   <div>
-    <div className='heading'>{messages.Geocoding.StartTitle}</div>
+    <div className='heading'>
+      {messages.Geocoding.StartTitle}
+    </div>
     <div className='Geocoder'>
       <Geocoder
         apiKey={process.env.MAPZEN_SEARCH_KEY}
@@ -69,7 +71,9 @@ export default ({
     </div>
     {start &&
       <div>
-        <div className='heading'>{messages.Geocoding.EndTitle}</div>
+        <div className='heading'>
+          {messages.Geocoding.EndTitle}
+        </div>
         <div className='Geocoder'>
           <Geocoder
             apiKey={process.env.MAPZEN_SEARCH_KEY}
diff --git a/src/components/log-item/index.js b/src/components/log-item/index.js
index a243420..34c9673 100644
--- a/src/components/log-item/index.js
+++ b/src/components/log-item/index.js
@@ -11,6 +11,8 @@ export default (props: LogItem) => (
     <small className='LogItem-createdAt'>
       {formatDate(props.createdAt, FORMAT)}
     </small>
-    <span className='LogItem-text'>{props.text}</span>
+    <span className='LogItem-text'>
+      {props.text}
+    </span>
   </div>
 )
diff --git a/src/components/map.js b/src/components/map.js
index 60a87e7..139bf86 100644
--- a/src/components/map.js
+++ b/src/components/map.js
@@ -11,6 +11,7 @@ import {
 } from 'react-leaflet'
 
 import Icon from './icon'
+import {setKeyTo} from '../utils/hash'
 import leafletIcon from '../utils/leaflet-icons'
 import messages from '../utils/messages'
 import TransitiveLayer from './transitive-map-layer'
@@ -33,10 +34,10 @@ const endIcon = leafletIcon({
 })
 
 type Props = {
+  active: number,
   centerCoordinates: Coordinate,
   clearStartAndEnd(): void,
-  geojson: Feature[],
-  geojsonColor: string,
+  isochrones: any[],
   markers: any[],
   pointsOfInterest: PointsOfInterest,
   setEnd(any): void,
@@ -107,11 +108,15 @@ export default class Map extends PureComponent<void, Props, State> {
     })
   }
 
+  _setZoom = (e: MapEvent) => {
+    setKeyTo('zoom', e.target._zoom)
+  }
+
   render (): React$Element<LeafletMap> {
     const {
+      active,
       centerCoordinates,
-      geojson,
-      geojsonColor,
+      isochrones,
       markers,
       pointsOfInterest,
       transitive,
@@ -129,11 +134,15 @@ export default class Map extends PureComponent<void, Props, State> {
       tileLayerProps.zoomOffset = -1
     }
 
+    const baseIsochrone = isochrones[0]
+    const comparisonIsochrone = active !== 0 ? isochrones[active] : null
+
     return (
       <LeafletMap
         center={centerCoordinates}
         className='Taui-Map'
         ref='map'
+        onZoomend={this._setZoom}
         zoom={zoom}
         onClick={this._onMapClick}
         preferCanvas
@@ -159,24 +168,20 @@ export default class Map extends PureComponent<void, Props, State> {
             onDragEnd={m.onDragEnd}
             position={m.position}
           >
-            {m.label && <Popup><span>{m.label}</span></Popup>}
+            {m.label &&
+              <Popup>
+                <span>
+                  {m.label}
+                </span>
+              </Popup>}
           </Marker>
         ))}
 
-        {geojson.map(g => {
-          return (
-            <GeoJson
-              key={`${g.key}`}
-              data={g}
-              style={{
-                fillColor: geojsonColor,
-                pointerEvents: 'none',
-                stroke: geojsonColor,
-                weight: 1
-              }}
-            />
-          )
-        })}
+        {baseIsochrone &&
+          <Isochrone isochrone={baseIsochrone} color='#4269a4' />}
+
+        {comparisonIsochrone &&
+          <Isochrone isochrone={comparisonIsochrone} color='darkorange' />}
 
         {transitive &&
           <TransitiveLayer data={transitive} styles={transitiveStyle} />}
@@ -184,22 +189,22 @@ export default class Map extends PureComponent<void, Props, State> {
         {showSelectStartOrEnd &&
           <Popup closeButton={false} position={lastClickedLatlng}>
             <div className='Popup'>
-              {lastClickedLabel && <h3>{lastClickedLabel}</h3>}
+              {lastClickedLabel &&
+                <h3>
+                  {lastClickedLabel}
+                </h3>}
               <button onClick={this._setStart}>
-                <Icon type='map-marker' />
-                {' '}
+                <Icon type='map-marker' />{' '}
                 {messages.Map.SetLocationPopup.SetStart}
               </button>
               {markers.length > 0 &&
                 <button onClick={this._setEnd}>
-                  <Icon type='map-marker' />
-                  {' '}
+                  <Icon type='map-marker' />{' '}
                   {messages.Map.SetLocationPopup.SetEnd}
                 </button>}
               {markers.length > 0 &&
                 <button onClick={this._clearStartAndEnd}>
-                  <Icon type='times' />
-                  {' '}
+                  <Icon type='times' />{' '}
                   {messages.Map.SetLocationPopup.ClearMarkers}
                 </button>}
             </div>
@@ -209,6 +214,21 @@ export default class Map extends PureComponent<void, Props, State> {
   }
 }
 
+function Isochrone ({isochrone, color}) {
+  return (
+    <GeoJson
+      key={`${isochrone.key}`}
+      data={isochrone}
+      style={{
+        fillColor: color,
+        pointerEvents: 'none',
+        stroke: color,
+        weight: 1
+      }}
+    />
+  )
+}
+
 class MapboxGeoJson extends GeoJson {
   componentWillMount () {
     const {mapbox} = require('mapbox.js')
diff --git a/src/components/route-card.js b/src/components/route-card.js
index 3fd0976..ad404ac 100644
--- a/src/components/route-card.js
+++ b/src/components/route-card.js
@@ -84,13 +84,15 @@ function TripDiff ({oldTravelTime, travelTime}) {
   if (oldTravelTime === 255) {
     return (
       <span className='increase'>
-        {messages.NewTrip} <Icon type='star' /><br />
+        {messages.NewTrip} <Icon type='star' />
+        <br />
       </span>
     )
   } else if (actualDiff > 0) {
     return (
       <span className='pull-right decrease'>
-        <strong>{diff}</strong>%<Icon type='level-up' /><br />
+        <strong>{diff}</strong>%<Icon type='level-up' />
+        <br />
       </span>
     )
   } else {
@@ -109,8 +111,12 @@ function Journeys ({journeys, oldTravelTime, travelTime, waitTime}) {
   if (!travelTime || !journeys) {
     return (
       <div className='CardJourneys'>
-        <div className='heading'>{messages.Systems.TripsTitle}</div>
-        <div>{messages.Systems.SelectEnd}</div>
+        <div className='heading'>
+          {messages.Systems.TripsTitle}
+        </div>
+        <div>
+          {messages.Systems.SelectEnd}
+        </div>
       </div>
     )
   }
@@ -118,8 +124,12 @@ function Journeys ({journeys, oldTravelTime, travelTime, waitTime}) {
   if (travelTime === 255 || journeys.length === 0) {
     return (
       <div className='CardJourneys'>
-        <div className='heading'>{messages.Systems.TripsTitle}</div>
-        <div>{messages.Systems.TripsEmpty}</div>
+        <div className='heading'>
+          {messages.Systems.TripsTitle}
+        </div>
+        <div>
+          {messages.Systems.TripsEmpty}
+        </div>
       </div>
     )
   }
@@ -128,19 +138,20 @@ function Journeys ({journeys, oldTravelTime, travelTime, waitTime}) {
 
   return (
     <div>
-      <div className='heading'>{messages.Systems.BestTripTitle}</div>
+      <div className='heading'>
+        {messages.Systems.BestTripTitle}
+      </div>
       <div className='BestTrip'>
-        <div><strong> {travelTime}</strong> {messages.Units.Mins}</div>
+        <div>
+          <strong> {travelTime}</strong> {messages.Units.Mins}
+        </div>
         <div>
           {oldTravelTime &&
             oldTravelTime !== travelTime &&
             <TripDiff oldTravelTime={oldTravelTime} travelTime={travelTime} />}
         </div>
         <div>
-          <strong>{waitTime}</strong>
-          {' '}
-          {messages.Units.Mins}
-          {' '}
+          <strong>{waitTime}</strong> {messages.Units.Mins}{' '}
           {messages.Systems.Waiting}
         </div>
         <div>
@@ -151,11 +162,15 @@ function Journeys ({journeys, oldTravelTime, travelTime, waitTime}) {
       </div>
       {journeys.length > 1 &&
         <div>
-          <div className='heading'>{messages.Systems.AlternateTripsTitle}</div>
+          <div className='heading'>
+            {messages.Systems.AlternateTripsTitle}
+          </div>
           <div className='Trips'>
             {alternateJourneys.map((segments, jindex) => (
               <div className='Trip' key={jindex}>
-                <span className='CardIndex'>{jindex + 1}.</span>
+                <span className='CardIndex'>
+                  {jindex + 1}.
+                </span>
                 {segments.map((segment, index) => (
                   <Segment key={index} segment={segment} />
                 ))}
@@ -204,16 +219,21 @@ function ShowAccess ({
 }) {
   return (
     <div className='CardAccess'>
-      <div className='heading'>{messages.Systems.AccessTitle}</div>
+      <div className='heading'>
+        {messages.Systems.AccessTitle}
+      </div>
       {base === ACCESSIBILITY_IS_EMPTY
-        ? <span>{messages.Systems.SelectStart}</span>
+        ? <span>
+          {messages.Systems.SelectStart}
+        </span>
         : base === ACCESSIBILITY_IS_LOADING
-            ? <span>{messages.Systems.CalculatingAccessibility}</span>
+            ? <span>
+              {messages.Systems.CalculatingAccessibility}
+            </span>
             : keys.map((k, i) => (
               <div className='Metric' key={k}>
                 <MetricIcon name={k} />
-                <strong> {(base[k] | 0).toLocaleString()} </strong>
-                {' '}
+                <strong> {(base[k] | 0).toLocaleString()} </strong>{' '}
                 {toSpaceCase(k)}
               </div>
               ))}
@@ -248,16 +268,21 @@ function AccessDiffPercentage ({newAccess, originalAccess}) {
 function ShowDiff ({keys, base, comparison}) {
   return (
     <div className='CardAccess'>
-      <div className='heading'>{messages.Systems.AccessTitle}</div>
+      <div className='heading'>
+        {messages.Systems.AccessTitle}
+      </div>
       {base === ACCESSIBILITY_IS_EMPTY
-        ? <span>{messages.Systems.SelectStart}</span>
+        ? <span>
+          {messages.Systems.SelectStart}
+        </span>
         : base === ACCESSIBILITY_IS_LOADING
-            ? <span>{messages.Systems.CalculatingAccessibility}</span>
+            ? <span>
+              {messages.Systems.CalculatingAccessibility}
+            </span>
             : keys.map((key, i) => (
               <div className='Metric' key={key}>
                 <MetricIcon name={key} />
-                <strong> {(base[key] | 0).toLocaleString()} </strong>
-                {' '}
+                <strong> {(base[key] | 0).toLocaleString()} </strong>{' '}
                 {toSpaceCase(key)}
                 <AccessDiffPercentage
                   newAccess={base[key]}
diff --git a/src/containers/__tests__/__snapshots__/index.js.snap b/src/containers/__tests__/__snapshots__/index.js.snap
index fc075e1..3ffc7df 100644
--- a/src/containers/__tests__/__snapshots__/index.js.snap
+++ b/src/containers/__tests__/__snapshots__/index.js.snap
@@ -222,6 +222,7 @@ exports[`Taui render the application container 1`] = `
           className="Fullscreen"
         >
           <Map
+            active={0}
             centerCoordinates={
               Array [
                 39.7691,
@@ -229,8 +230,7 @@ exports[`Taui render the application container 1`] = `
               ]
             }
             clearStartAndEnd={[Function]}
-            geojson={Array []}
-            geojsonColor="#4269a4"
+            isochrones={Array []}
             markers={Array []}
             pointsOfInterest={
               Array [
@@ -289,6 +289,7 @@ exports[`Taui render the application container 1`] = `
               }
               className="Taui-Map"
               onClick={[Function]}
+              onZoomend={[Function]}
               preferCanvas={true}
               zoom={11}
               zoomControl={false}
@@ -340,6 +341,12 @@ exports[`Taui render the application container 1`] = `
                             "context": [Circular],
                           },
                         ],
+                        "zoomend": Array [
+                          Object {
+                            "action": [Function],
+                            "context": [Circular],
+                          },
+                        ],
                       },
                       "_limitCenter": [Function],
                       "_limitOffset": [Function],
@@ -466,6 +473,7 @@ exports[`Taui render the application container 1`] = `
                         "keyboardZoomOffset": 1,
                         "markerZoomAnimation": false,
                         "onClick": [Function],
+                        "onZoomend": [Function],
                         "preferCanvas": true,
                         "scrollWheelZoom": true,
                         "tap": true,
@@ -539,6 +547,12 @@ exports[`Taui render the application container 1`] = `
                             "context": [Circular],
                           },
                         ],
+                        "zoomend": Array [
+                          Object {
+                            "action": [Function],
+                            "context": [Circular],
+                          },
+                        ],
                       },
                       "_limitCenter": [Function],
                       "_limitOffset": [Function],
@@ -665,6 +679,7 @@ exports[`Taui render the application container 1`] = `
                         "keyboardZoomOffset": 1,
                         "markerZoomAnimation": false,
                         "onClick": [Function],
+                        "onZoomend": [Function],
                         "preferCanvas": true,
                         "scrollWheelZoom": true,
                         "tap": true,
@@ -742,6 +757,12 @@ exports[`Taui render the application container 1`] = `
                             "context": [Circular],
                           },
                         ],
+                        "zoomend": Array [
+                          Object {
+                            "action": [Function],
+                            "context": [Circular],
+                          },
+                        ],
                       },
                       "_limitCenter": [Function],
                       "_limitOffset": [Function],
@@ -868,6 +889,7 @@ exports[`Taui render the application container 1`] = `
                         "keyboardZoomOffset": 1,
                         "markerZoomAnimation": false,
                         "onClick": [Function],
+                        "onZoomend": [Function],
                         "preferCanvas": true,
                         "scrollWheelZoom": true,
                         "tap": true,
@@ -941,6 +963,12 @@ exports[`Taui render the application container 1`] = `
                             "context": [Circular],
                           },
                         ],
+                        "zoomend": Array [
+                          Object {
+                            "action": [Function],
+                            "context": [Circular],
+                          },
+                        ],
                       },
                       "_limitCenter": [Function],
                       "_limitOffset": [Function],
@@ -1067,6 +1095,7 @@ exports[`Taui render the application container 1`] = `
                         "keyboardZoomOffset": 1,
                         "markerZoomAnimation": false,
                         "onClick": [Function],
+                        "onZoomend": [Function],
                         "preferCanvas": true,
                         "scrollWheelZoom": true,
                         "tap": true,
@@ -1177,6 +1206,12 @@ exports[`Taui render the application container 1`] = `
                             "context": [Circular],
                           },
                         ],
+                        "zoomend": Array [
+                          Object {
+                            "action": [Function],
+                            "context": [Circular],
+                          },
+                        ],
                       },
                       "_limitCenter": [Function],
                       "_limitOffset": [Function],
@@ -1303,6 +1338,7 @@ exports[`Taui render the application container 1`] = `
                         "keyboardZoomOffset": 1,
                         "markerZoomAnimation": false,
                         "onClick": [Function],
+                        "onZoomend": [Function],
                         "preferCanvas": true,
                         "scrollWheelZoom": true,
                         "tap": true,
@@ -1376,6 +1412,12 @@ exports[`Taui render the application container 1`] = `
                             "context": [Circular],
                           },
                         ],
+                        "zoomend": Array [
+                          Object {
+                            "action": [Function],
+                            "context": [Circular],
+                          },
+                        ],
                       },
                       "_limitCenter": [Function],
                       "_limitOffset": [Function],
@@ -1502,6 +1544,7 @@ exports[`Taui render the application container 1`] = `
                         "keyboardZoomOffset": 1,
                         "markerZoomAnimation": false,
                         "onClick": [Function],
+                        "onZoomend": [Function],
                         "preferCanvas": true,
                         "scrollWheelZoom": true,
                         "tap": true,
diff --git a/src/index.css b/src/index.css
index 5c92266..8c45bc3 100644
--- a/src/index.css
+++ b/src/index.css
@@ -147,6 +147,10 @@ body {
   display: block;
 }
 
+.CardTitle:focus {
+  outline: none;
+}
+
 .Card-active > .CardTitle {
   cursor: inherit;
 }
diff --git a/src/index.js b/src/index.js
index 1bab882..94b9a04 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,7 +3,12 @@ import mount from '@conveyal/woonerf/mount'
 
 import Application from './containers/application'
 import reducers from './reducers'
+import messages from './utils/messages'
 
+// Set the title
+document.title = messages.Title
+
+// Mount the app
 mount({
   app: Application,
   reducers
diff --git a/src/types.js b/src/types.js
index b300a08..4f4b384 100644
--- a/src/types.js
+++ b/src/types.js
@@ -128,6 +128,7 @@ export type InputEvent = Event & {
 export type MapEvent = {
   latlng?: Coordinate,
   target: {
-    _latlng: Coordinate
+    _latlng: Coordinate,
+    _zoom: number
   }
 }