diff --git a/e2e/src/settings.e2e-spec.ts b/e2e/src/settings.e2e-spec.ts
index b2221525..9771fdf0 100644
--- a/e2e/src/settings.e2e-spec.ts
+++ b/e2e/src/settings.e2e-spec.ts
@@ -23,7 +23,7 @@ describe('Settings', () => {
 
   describe('settings-page', () => {
     beforeEach(() => {
-      page.navigateTo('#/settings');
+      page.navigateTo('/settings');
     });
 
     it('should have a localized title saying "Einstellungen"', () => {
diff --git a/package-lock.json b/package-lock.json
index 6aa40f76..19051355 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2047,6 +2047,15 @@
           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
+        "i18next": {
+          "version": "17.3.1",
+          "resolved": "https://registry.npmjs.org/i18next/-/i18next-17.3.1.tgz",
+          "integrity": "sha512-4nY+yaENaoZKmpbiDXPzucVHCN3hN9Z9Zk7LyQXVOKVIpnYOJ3L/yxHJlBPtJDq3PGgjFwA0QBFm/26Z0iDT5A==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.3.1"
+          }
+        },
         "jsonfile": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -11302,12 +11311,11 @@
       "dev": true
     },
     "i18next": {
-      "version": "17.3.1",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-17.3.1.tgz",
-      "integrity": "sha512-4nY+yaENaoZKmpbiDXPzucVHCN3hN9Z9Zk7LyQXVOKVIpnYOJ3L/yxHJlBPtJDq3PGgjFwA0QBFm/26Z0iDT5A==",
-      "dev": true,
+      "version": "20.3.5",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-20.3.5.tgz",
+      "integrity": "sha512-//MGeU6n4TencJmCgG+TCrpdgAD/NDEU/KfKQekYbJX6QV7sD/NjWQdVdBi+bkT0snegnSoB7QhjSeatrk3a0w==",
       "requires": {
-        "@babel/runtime": "^7.3.1"
+        "@babel/runtime": "^7.12.0"
       }
     },
     "i18next-browser-languagedetector": {
@@ -11316,16 +11324,6 @@
       "integrity": "sha512-YDzIGHhMRvr7M+c8B3EQUKyiMBhfqox4o1qkFvt4QXuu5V2cxf74+NCr+VEkUuU0y+RwcupA238eeolW1Yn80g==",
       "requires": {
         "@babel/runtime": "^7.14.6"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.14.6",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
-          "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        }
       }
     },
     "iconv-lite": {
@@ -14559,16 +14557,6 @@
         "i18next": "^20.2.1",
         "i18next-browser-languagedetector": "^6.1.0",
         "suncalc": "^1.8.0"
-      },
-      "dependencies": {
-        "i18next": {
-          "version": "20.3.2",
-          "resolved": "https://registry.npmjs.org/i18next/-/i18next-20.3.2.tgz",
-          "integrity": "sha512-e8CML2R9Ng2sSQOM80wb/PrM2j8mDm84o/T4Amzn9ArVyNX5/ENWxxAXkRpZdTQNDaxKImF93Wep4mAoozFrKw==",
-          "requires": {
-            "@babel/runtime": "^7.12.0"
-          }
-        }
       }
     },
     "opn": {
diff --git a/src/app/modules/data/types/dish/dish-detail-content.html b/src/app/modules/data/types/dish/dish-detail-content.html
index ecf057fb..73667ddf 100644
--- a/src/app/modules/data/types/dish/dish-detail-content.html
+++ b/src/app/modules/data/types/dish/dish-detail-content.html
@@ -15,8 +15,7 @@
         *ngIf="characteristic.image"
         [src]="characteristic.image"
         alt=""
-      /><span>&nbsp;{{ characteristic.name }}</span
-      >&nbsp;&nbsp;
+      /><span> {{ characteristic.name }}</span>
     </p>
   </ion-card-content>
 </ion-card>
diff --git a/src/app/modules/data/types/place/place-list-item.html b/src/app/modules/data/types/place/place-list-item.html
index d9c3983c..978a8233 100644
--- a/src/app/modules/data/types/place/place-list-item.html
+++ b/src/app/modules/data/types/place/place-list-item.html
@@ -13,27 +13,36 @@
             <ion-note
               *ngIf="item.categories && item.type !== 'building'; else onlyType"
             >
-              {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }}
+              <ul>
+                <li>
+                  {{
+                    'categories' | thingTranslate: item | join: ', ' | titlecase
+                  }}
+                </li>
+                <li *ngIf="distance">
+                  <ion-icon name="walk"></ion-icon
+                  >{{ distance | numberLocalized: 'style:unit,unit:meter,notation:compact' }}
+                </li>
+              </ul>
             </ion-note>
           </p>
           <ng-template #onlyType>
             <ion-note>
-              {{ 'type' | thingTranslate: item }}
+              <ul>
+                <li>
+                  {{ 'type' | thingTranslate: item }}
+                </li>
+                <li *ngIf="distance">
+                  <ion-icon name="walk"></ion-icon
+                  >{{ distance | numberLocalized: '1.0-0' }} m
+                </li>
+              </ul>
             </ion-note>
           </ng-template>
         </ng-container>
         <p *ngIf="item.description">
           {{ 'description' | thingTranslate: item }}
         </p>
-        <ion-note>
-          <ul>
-            <li>{{ 'type' | thingTranslate: item }}</li>
-            <li *ngIf="distance">
-              <ion-icon name="walk"></ion-icon
-              >{{ distance | numberLocalized: '1.0-0' }} m
-            </li>
-          </ul>
-        </ion-note>
       </div>
     </ion-col>
     <div *ngIf="item.type !== 'building'">