diff --git a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
index 1a5af6b06..629be1f50 100644
--- a/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
+++ b/__tests__/components/viewers/__snapshots__/nearby-view.js.snap
@@ -35,6 +35,7 @@ exports[`components > viewers > nearby view renders nothing on a blank page 1`]
         fetchNearby={[Function]}
         homeTimezone="America/Los_Angeles"
         nearby={Array []}
+        routeSortComparator={[Function]}
         setHighlightedLocation={[Function]}
         setLocation={[Function]}
         setMainPanelContent={[Function]}
@@ -66,7 +67,7 @@ exports[`components > viewers > nearby view renders nothing on a blank page 1`]
               }
             >
               <h3
-                className="sc-jvfqPk gYtyWO"
+                className="sc-hkwmXC kUuDwY"
                 style={
                   Object {
                     "position": "absolute",
@@ -94,16 +95,13 @@ exports[`components > viewers > nearby view renders nothing on a blank page 1`]
               }
             >
               <ol
-                className="sc-dcwqsv gGYuaw base-color-bg"
+                className="sc-dcwqsv hldTAQ base-color-bg"
                 style={
                   Object {
                     "marginBottom": 0,
                   }
                 }
               >
-                <div
-                  aria-hidden={true}
-                />
                 <FormattedMessage
                   id="components.NearbyView.nothingNearby"
                 >
@@ -4078,6 +4076,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
             },
           ]
         }
+        routeSortComparator={[Function]}
         setHighlightedLocation={[Function]}
         setLocation={[Function]}
         setMainPanelContent={[Function]}
@@ -4109,7 +4108,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
               }
             >
               <h3
-                className="sc-jvfqPk gYtyWO"
+                className="sc-hkwmXC kUuDwY"
                 style={
                   Object {
                     "position": "absolute",
@@ -4137,16 +4136,13 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
               }
             >
               <ol
-                className="sc-dcwqsv gGYuaw base-color-bg"
+                className="sc-dcwqsv hldTAQ base-color-bg"
                 style={
                   Object {
                     "marginBottom": 0,
                   }
                 }
               >
-                <div
-                  aria-hidden={true}
-                />
                 <li
                   className=""
                   key="UmVudGFsVmVoaWNsZTpsaW1lX3NlYXR0bGU6MDM1NDBhOWUtZTY1Ny00NTRlLWFlN2ItOGFkOWRhODZjZmVk"
@@ -4300,7 +4296,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -4756,7 +4752,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -5212,7 +5208,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -10796,7 +10792,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             >
                                               <Styled(styled.span)>
                                                 <span
-                                                  className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                  className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                 >
                                                   <Calendar>
                                                     <StyledIconBase
@@ -12464,7 +12460,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -12577,7 +12573,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -12638,7 +12634,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -12739,7 +12735,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -12800,7 +12796,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -12901,7 +12897,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -12957,7 +12953,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -13292,7 +13288,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -13405,7 +13401,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -13466,7 +13462,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -13567,7 +13563,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -13623,7 +13619,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -13724,7 +13720,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -13780,7 +13776,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -14050,7 +14046,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -14163,7 +14159,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -14224,7 +14220,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -14325,7 +14321,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -14381,7 +14377,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -14482,7 +14478,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -14538,7 +14534,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -18069,7 +18065,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             >
                                               <Styled(styled.span)>
                                                 <span
-                                                  className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                  className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                 >
                                                   <Calendar>
                                                     <StyledIconBase
@@ -19270,7 +19266,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -19383,7 +19379,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -19439,7 +19435,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -19540,7 +19536,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -19596,7 +19592,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -19697,7 +19693,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -19753,7 +19749,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -19971,7 +19967,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -20084,7 +20080,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -20140,7 +20136,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="saturday"
@@ -20475,7 +20471,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -20588,7 +20584,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -20644,7 +20640,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="saturday"
@@ -20745,7 +20741,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -20801,7 +20797,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="saturday"
@@ -20902,7 +20898,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -20958,7 +20954,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="saturday"
@@ -21170,7 +21166,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -21626,7 +21622,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -22082,7 +22078,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -28359,7 +28355,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             >
                                               <Styled(styled.span)>
                                                 <span
-                                                  className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                  className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                 >
                                                   <Calendar>
                                                     <StyledIconBase
@@ -30181,7 +30177,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -30294,7 +30290,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -30355,7 +30351,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -30456,7 +30452,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -30517,7 +30513,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -30618,7 +30614,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -30674,7 +30670,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -31022,7 +31018,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -31135,7 +31131,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -31196,7 +31192,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -31297,7 +31293,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -31353,7 +31349,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -31454,7 +31450,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -31515,7 +31511,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -31785,7 +31781,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -31898,7 +31894,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -31954,7 +31950,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -32055,7 +32051,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -32111,7 +32107,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -32212,7 +32208,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -32268,7 +32264,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -32486,7 +32482,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -32599,7 +32595,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -32655,7 +32651,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -32867,7 +32863,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -33323,7 +33319,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -33779,7 +33775,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -34235,7 +34231,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -34691,7 +34687,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -38466,7 +38462,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             >
                                               <Styled(styled.span)>
                                                 <span
-                                                  className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                  className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                 >
                                                   <Calendar>
                                                     <StyledIconBase
@@ -39667,7 +39663,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -39780,7 +39776,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -39841,7 +39837,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -39942,7 +39938,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -39998,7 +39994,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -40099,7 +40095,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -40155,7 +40151,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -40490,7 +40486,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -40603,7 +40599,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -40659,7 +40655,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -40760,7 +40756,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -40816,7 +40812,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -40917,7 +40913,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -40973,7 +40969,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -41191,7 +41187,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -41304,7 +41300,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -41360,7 +41356,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -41572,7 +41568,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -46922,7 +46918,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             >
                                               <Styled(styled.span)>
                                                 <span
-                                                  className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                  className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                 >
                                                   <Calendar>
                                                     <StyledIconBase
@@ -48629,7 +48625,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -48742,7 +48738,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -48803,7 +48799,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -48904,7 +48900,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -48965,7 +48961,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -49066,7 +49062,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -49127,7 +49123,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -55160,7 +55156,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             >
                                               <Styled(styled.span)>
                                                 <span
-                                                  className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                  className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                 >
                                                   <Calendar>
                                                     <StyledIconBase
@@ -56917,7 +56913,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -57030,7 +57026,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -57086,7 +57082,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -57187,7 +57183,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -57243,7 +57239,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -57344,7 +57340,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -57400,7 +57396,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -57670,7 +57666,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -57783,7 +57779,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -57844,7 +57840,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -57945,7 +57941,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -58001,7 +57997,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -58102,7 +58098,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -58158,7 +58154,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -58428,7 +58424,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -58541,7 +58537,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -58597,7 +58593,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -58698,7 +58694,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -58754,7 +58750,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -58855,7 +58851,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -58911,7 +58907,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -59246,7 +59242,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -59359,7 +59355,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -59415,7 +59411,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -59516,7 +59512,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -59572,7 +59568,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -59673,7 +59669,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -59729,7 +59725,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -59999,7 +59995,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -60112,7 +60108,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -60168,7 +60164,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -60269,7 +60265,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -60325,7 +60321,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -60426,7 +60422,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -60482,7 +60478,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -60726,7 +60722,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -60839,7 +60835,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -60895,7 +60891,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -60996,7 +60992,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -61052,7 +61048,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -61153,7 +61149,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -61209,7 +61205,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -61421,7 +61417,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                       >
                                         <Styled(styled.span)>
                                           <span
-                                            className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                            className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                           >
                                             <StationIcon
                                               companyLabel=""
@@ -67005,7 +67001,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                             >
                                               <Styled(styled.span)>
                                                 <span
-                                                  className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                  className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                 >
                                                   <Calendar>
                                                     <StyledIconBase
@@ -68673,7 +68669,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -68786,7 +68782,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -68847,7 +68843,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -68948,7 +68944,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -69009,7 +69005,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -69110,7 +69106,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -69166,7 +69162,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -69501,7 +69497,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -69614,7 +69610,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -69675,7 +69671,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -69776,7 +69772,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -69832,7 +69828,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -69933,7 +69929,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -69989,7 +69985,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -70259,7 +70255,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                   >
                                                     <Styled(styled.span)>
                                                       <span
-                                                        className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                        className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                       >
                                                         <Calendar>
                                                           <StyledIconBase
@@ -70372,7 +70368,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.realtime"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -70433,7 +70429,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -70534,7 +70530,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -70590,7 +70586,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
@@ -70691,7 +70687,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                         title="components.StopTimeCell.scheduled"
                                                       >
                                                         <span
-                                                          className="sc-hkwmXC sc-bSFUlv eFsrhn gAUjbw"
+                                                          className="sc-bSFUlv sc-jvfqPk gFxSud bAWwqY"
                                                           style={
                                                             Object {
                                                               "fontSize": "0.6em",
@@ -70747,7 +70743,7 @@ exports[`components > viewers > nearby view renders proper scooter dates 1`] = `
                                                       >
                                                         <styled.span>
                                                           <span
-                                                            className="sc-jvfqPk iMPxnQ"
+                                                            className="sc-hkwmXC eVsZcu"
                                                           >
                                                             <FormattedDayOfWeek
                                                               day="friday"
diff --git a/lib/components/app/responsive-webapp.js b/lib/components/app/responsive-webapp.js
index c2e11360c..7c7480921 100644
--- a/lib/components/app/responsive-webapp.js
+++ b/lib/components/app/responsive-webapp.js
@@ -87,7 +87,6 @@ class ResponsiveWebapp extends Component {
       map,
       matchContentToUrl,
       query,
-      receivedPositionResponse,
       setLocationToCurrent,
       setMapCenter
     } = this.props
@@ -138,25 +137,6 @@ class ResponsiveWebapp extends Component {
       }
     }
 
-    // Watch for position changing on mobile
-    if (isMobile()) {
-      navigator.geolocation.watchPosition(
-        // On success
-        (position) => {
-          const shouldUpdate = this.positionShouldUpdate(position)
-          if (shouldUpdate) {
-            receivedPositionResponse({ position })
-          }
-        },
-        // On error
-        (error) => {
-          console.log('error in watchPosition', error)
-        },
-        // Options
-        { enableHighAccuracy: true }
-      )
-    }
-
     // If the path changes (e.g., via a back button press) check whether the
     // main content needs to switch between, for example, a viewer and a search.
     if (!isEqual(location.pathname, prevProps.location.pathname)) {
@@ -192,6 +172,7 @@ class ResponsiveWebapp extends Component {
       map,
       matchContentToUrl,
       parseUrlQueryString,
+      receivedPositionResponse,
       setNetworkConnectionLost
     } = this.props
     // Add on back button press behavior.
@@ -216,6 +197,21 @@ class ResponsiveWebapp extends Component {
     if (isMobile()) {
       // Test location availability on load
       getCurrentPosition(intl)
+      // Watch for position changing on mobile
+      navigator.geolocation.watchPosition(
+        // On success
+        (position) => {
+          if (this.positionShouldUpdate(position)) {
+            receivedPositionResponse({ position })
+          }
+        },
+        // On error
+        (error) => {
+          console.log('error in watchPosition', error)
+        },
+        // Options
+        { enableHighAccuracy: true }
+      )
     }
     // Handle routing to a specific part of the app (e.g. stop viewer) on page
     // load. (This happens prior to routing request in case special routerId is
diff --git a/lib/components/viewers/nearby/nearby-view.tsx b/lib/components/viewers/nearby/nearby-view.tsx
index 9c60ff677..be54085ae 100644
--- a/lib/components/viewers/nearby/nearby-view.tsx
+++ b/lib/components/viewers/nearby/nearby-view.tsx
@@ -2,14 +2,21 @@ import { connect } from 'react-redux'
 import { FormattedMessage, useIntl } from 'react-intl'
 import { Location } from '@opentripplanner/types'
 import { MapRef, useMap } from 'react-map-gl'
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import coreUtils from '@opentripplanner/core-utils'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
 
 import * as apiActions from '../../../actions/api'
 import * as mapActions from '../../../actions/map'
 import * as uiActions from '../../../actions/ui'
 import { AppReduxState } from '../../../util/state-types'
 import { getCurrentServiceWeek } from '../../../util/current-service-week'
-import { SetLocationHandler, ZoomToPlaceHandler } from '../../util/types'
+import { NearbyViewConfig } from '../../../util/config-types'
+import {
+  PatternStopTime,
+  SetLocationHandler,
+  ZoomToPlaceHandler
+} from '../../util/types'
+import InvisibleA11yLabel from '../../util/invisible-a11y-label'
 import Loading from '../../narrative/loading'
 import MobileContainer from '../../mobile/container'
 import MobileNavigationBar from '../../mobile/navigation-bar'
@@ -22,13 +29,12 @@ import {
   Scrollable
 } from './styled'
 import FromToPicker from './from-to-picker'
-import InvisibleA11yLabel from '../../util/invisible-a11y-label'
 import RentalStation from './rental-station'
-import Stop from './stop'
+import Stop, { fullTimestamp, patternArrayforStops } from './stop'
 import Vehicle from './vehicle-rent'
 import VehicleParking from './vehicle-parking'
 
-const AUTO_REFRESH_INTERVAL = 15000
+const AUTO_REFRESH_INTERVAL = 15000000
 
 // TODO: use lonlat package
 type LatLonObj = { lat: number; lon: number }
@@ -49,9 +55,12 @@ type Props = {
   hideBackButton?: boolean
   location: string
   mobile?: boolean
+  // Todo: type nearby results
   nearby: any
+  nearbyViewConfig?: NearbyViewConfig
   nearbyViewCoords?: LatLonObj
   radius?: number
+  routeSortComparator: (a: PatternStopTime, b: PatternStopTime) => number
   setHighlightedLocation: (location: Location | null) => void
   setLocation: SetLocationHandler
   setMainPanelContent: (content: number) => void
@@ -118,8 +127,10 @@ function NearbyView({
   location,
   mobile,
   nearby,
+  nearbyViewConfig,
   nearbyViewCoords,
   radius,
+  routeSortComparator,
   setHighlightedLocation,
   setMainPanelContent,
   setViewedNearbyCoords,
@@ -128,7 +139,6 @@ function NearbyView({
   const map = useMap().default
   const intl = useIntl()
   const [loading, setLoading] = useState(true)
-  const firstItemRef = useRef<HTMLDivElement>(null)
   const finalNearbyCoords = useMemo(
     () =>
       getNearbyCoordsFromUrlOrLocationOrMapCenter(
@@ -180,9 +190,11 @@ function NearbyView({
   }, [map, setViewedNearbyCoords, setHighlightedLocation])
 
   useEffect(() => {
-    if (typeof firstItemRef.current?.scrollIntoView === 'function') {
-      firstItemRef.current?.scrollIntoView({ behavior: 'smooth' })
-    }
+    window.scrollTo({
+      behavior: 'smooth',
+      left: 0,
+      top: 0
+    })
     if (finalNearbyCoords) {
       fetchNearby(finalNearbyCoords, radius, currentServiceWeek)
       setLoading(true)
@@ -223,9 +235,19 @@ function NearbyView({
         .flat(Infinity)
     )
   )
+
+  // If configured, filter out stops that don't have any patterns
+  const filteredNearby = nearby?.filter((n: any) => {
+    if (n.place.__typename === 'Stop' && nearbyViewConfig?.hideEmptyStops) {
+      const patternArray = patternArrayforStops(n.place, routeSortComparator)
+      return !(patternArray?.length === 0)
+    }
+    return true
+  })
+
   const nearbyItemList =
-    nearby?.map &&
-    nearby?.map((n: any) => (
+    filteredNearby?.map &&
+    filteredNearby?.map((n: any) => (
       <li
         className={
           (n.place.gtfsId ?? n.place.id) === entityId ? 'highlighted' : ''
@@ -250,6 +272,11 @@ function NearbyView({
   useEffect(() => {
     if (!staleData) {
       setLoading(false)
+    } else if (staleData) {
+      // If there's stale data, fetch again
+      setLoading(true)
+      finalNearbyCoords &&
+        fetchNearby(finalNearbyCoords, radius, currentServiceWeek)
     }
   }, [nearby, staleData])
 
@@ -285,8 +312,6 @@ function NearbyView({
         className="base-color-bg"
         style={{ marginBottom: 0 }}
       >
-        {/* This is used to scroll to top */}
-        <div aria-hidden ref={firstItemRef} />
         {loading && (
           <FloatingLoadingIndicator>
             <Loading extraSmall />
@@ -296,7 +321,7 @@ function NearbyView({
           !staleData &&
           (nearby.error ? (
             intl.formatMessage({ id: 'components.NearbyView.error' })
-          ) : nearby.length > 0 ? (
+          ) : filteredNearby?.length > 0 ? (
             nearbyItemList
           ) : (
             <FormattedMessage id="components.NearbyView.nothingNearby" />
@@ -309,7 +334,8 @@ function NearbyView({
 
 const mapStateToProps = (state: AppReduxState) => {
   const { config, location, transitIndex, ui } = state.otp
-  const { map, routeViewer } = config
+  const { map, nearbyView: nearbyViewConfig, routeViewer } = config
+  const transitOperators = config?.transitOperators || []
   const { nearbyViewCoords } = ui
   const { nearby } = transitIndex
   const { entityId } = state.router.location.query
@@ -322,6 +348,20 @@ const mapStateToProps = (state: AppReduxState) => {
       ? getCurrentServiceWeek()
       : undefined
 
+  // TODO: Refine so we don't have this same thing in stops.tsx
+  // Default sort: departure time
+  let routeSortComparator = (a: PatternStopTime, b: PatternStopTime) =>
+    fullTimestamp(a.stoptimes?.[0]) - fullTimestamp(b.stoptimes?.[0])
+
+  if (nearbyViewConfig?.useRouteViewSort) {
+    routeSortComparator = (a: PatternStopTime, b: PatternStopTime) =>
+      coreUtils.route.makeRouteComparator(transitOperators)(
+        // @ts-expect-error core-utils types are wrong!
+        a.pattern.route,
+        b.pattern.route
+      )
+  }
+
   return {
     currentPosition,
     currentServiceWeek,
@@ -331,8 +371,10 @@ const mapStateToProps = (state: AppReduxState) => {
     homeTimezone: config.homeTimezone,
     location: state.router.location.hash,
     nearby: nearby?.data,
+    nearbyViewConfig,
     nearbyViewCoords,
-    radius: config.nearbyView?.radius
+    radius: config.nearbyView?.radius,
+    routeSortComparator
   }
 }
 
diff --git a/lib/components/viewers/nearby/stop.tsx b/lib/components/viewers/nearby/stop.tsx
index c98d288c1..973f8ddb3 100644
--- a/lib/components/viewers/nearby/stop.tsx
+++ b/lib/components/viewers/nearby/stop.tsx
@@ -16,7 +16,7 @@ import StopCardHeader from './stop-card-header'
 
 const { getUserTimezone } = coreUtils.time
 
-const fullTimestamp = (stoptime: StopTime) =>
+export const fullTimestamp = (stoptime: StopTime) =>
   (stoptime.serviceDay || 0) + (stoptime.realtimeDeparture || 0)
 
 type Props = {
@@ -27,14 +27,11 @@ type Props = {
   stopData: StopData & { nearbyRoutes?: string[] }
 }
 
-const Stop = ({
-  fromToSlot,
-  homeTimezone,
-  nearbyViewConfig,
-  routeSortComparator,
-  stopData
-}: Props): JSX.Element => {
-  const patternRows = (stopData.stoptimesForPatterns || [])
+export const patternArrayforStops = (
+  stopData: StopData & { nearbyRoutes?: string[] },
+  routeSortComparator: (a: PatternStopTime, b: PatternStopTime) => number
+): Array<PatternStopTime> | undefined => {
+  return stopData?.stoptimesForPatterns
     ?.reduce<PatternStopTime[]>((acc, cur) => {
       const currentHeadsign = extractHeadsignFromPattern(cur.pattern)
       const dupe = acc.findIndex((p) => {
@@ -65,30 +62,40 @@ const Stop = ({
       return acc
     }, [])
     .sort(routeSortComparator)
-    .map((st: any, index: number) => {
-      const sortedStopTimes = st.stoptimes.sort(
-        (a: StopTime, b: StopTime) => fullTimestamp(a) - fullTimestamp(b)
-      )
-      if (
-        // NearbyRoutes if present is populated with a list of routes that appear
-        // in the current service period.
-        stopData.nearbyRoutes &&
-        !stopData.nearbyRoutes.includes(st?.pattern?.route?.gtfsId)
-      ) {
-        return <></>
-      }
-      return (
-        <PatternRow
-          alwaysShowLongName={nearbyViewConfig?.alwaysShowLongName}
-          homeTimezone={homeTimezone}
-          key={index}
-          pattern={st.pattern}
-          roundedTop={false}
-          route={st.pattern.route}
-          stopTimes={sortedStopTimes}
-        />
-      )
-    })
+}
+
+const Stop = ({
+  fromToSlot,
+  homeTimezone,
+  nearbyViewConfig,
+  routeSortComparator,
+  stopData
+}: Props): JSX.Element => {
+  const patternArray = patternArrayforStops(stopData, routeSortComparator)
+  const patternRows = patternArray?.map((st: any, index: number) => {
+    const sortedStopTimes = st.stoptimes.sort(
+      (a: StopTime, b: StopTime) => fullTimestamp(a) - fullTimestamp(b)
+    )
+    if (
+      // NearbyRoutes if present is populated with a list of routes that appear
+      // in the current service period.
+      stopData.nearbyRoutes &&
+      !stopData.nearbyRoutes.includes(st?.pattern?.route?.gtfsId)
+    ) {
+      return <></>
+    }
+    return (
+      <PatternRow
+        alwaysShowLongName={nearbyViewConfig?.alwaysShowLongName}
+        homeTimezone={homeTimezone}
+        key={index}
+        pattern={st.pattern}
+        roundedTop={false}
+        route={st.pattern.route}
+        stopTimes={sortedStopTimes}
+      />
+    )
+  })
   const inHomeTimezone = homeTimezone && homeTimezone === getUserTimezone()
   const timezoneWarning = !inHomeTimezone && (
     <StyledAlert>
@@ -96,8 +103,6 @@ const Stop = ({
     </StyledAlert>
   )
 
-  if (nearbyViewConfig?.hideEmptyStops && patternRows.length === 0) return <></>
-
   return (
     <Card>
       <StopCardHeader
diff --git a/lib/components/viewers/nearby/styled.tsx b/lib/components/viewers/nearby/styled.tsx
index 8ee6bef6e..48acffebb 100644
--- a/lib/components/viewers/nearby/styled.tsx
+++ b/lib/components/viewers/nearby/styled.tsx
@@ -19,6 +19,14 @@ export const NearbySidebarContainer = styled.ol`
   padding: 0 1em;
   list-style: none;
 
+  & > li:last-of-type {
+    margin-bottom: 1em;
+  }
+
+  & > li:first-of-type {
+    margin-top: 1em;
+  }
+
   @media (max-width: 768px) {
     min-height: calc(100vh - 50px);
   }