diff --git a/addon/components/link-street.hbs b/addon/components/link-street.hbs
index f34705d1..66b0c82a 100644
--- a/addon/components/link-street.hbs
+++ b/addon/components/link-street.hbs
@@ -1,7 +1,5 @@
 {{#if this.fetchStreet.isRunning}}
-  <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-    <UkSpinner @ratio={{3}} />
-  </div>
+  <Loading />
 {{else}}
   {{#let @fieldComponent as |Field|}}
     {{#unless @buildingEntrance.street.isNew}}
@@ -74,7 +72,10 @@
     <div class="uk-flex-inline">
       <LinkTo
         class="uk-button
-          {{if @buildingEntrance.street.isNew "uk-button-primary" "uk-button-default"
+          {{if
+            @buildingEntrance.street.isNew
+            'uk-button-primary'
+            'uk-button-default'
           }}"
         @route="building.edit.entrance.edit.link-street"
         @models={{or
@@ -88,9 +89,9 @@
         }}
         @disabled={{not @buildingEntrance.locality.name.nameLong}}
         uk-tooltip="title: {{unless
-            @buildingEntrance.locality.name.nameLong
-            (t "ember-gwr.components.linkStreet.missingLocalityHint")
-          }}; container: {{this.config.modalContainer}}"
+          @buildingEntrance.locality.name.nameLong
+          (t 'ember-gwr.components.linkStreet.missingLocalityHint')
+        }}; container: {{this.config.modalContainer}}"
       >
         {{t
           (if
@@ -102,4 +103,4 @@
       </LinkTo>
     </div>
   {{/let}}
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/addon/components/loading.hbs b/addon/components/loading.hbs
new file mode 100644
index 00000000..f59e032c
--- /dev/null
+++ b/addon/components/loading.hbs
@@ -0,0 +1,3 @@
+<div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
+  <UkSpinner @ratio={{3}} />
+</div>
diff --git a/addon/components/login-modal.hbs b/addon/components/login-modal.hbs
index 0d28b9e4..1d84ed89 100644
--- a/addon/components/login-modal.hbs
+++ b/addon/components/login-modal.hbs
@@ -1,83 +1,88 @@
-{{#if this.authFetch.showAuthModal}}
-  <UkCard
-    @color="default"
-    class="ember-ebau-gwr-login uk-width-2xlarge uk-margin-auto"
-    as |card|
-  >
-    <card.header>
-      <h2 class="uk-modal-title">
-        {{t "ember-gwr.components.loginModal.header"}}
-      </h2>
-    </card.header>
-    <card.body>
-      <div class="uk-grid-small" uk-grid>
-        <div class="uk-width-1-2">
-          <input
-            name="username"
-            class="uk-input"
-            placeholder={{t "ember-gwr.components.loginModal.username"}}
-            aria-label={{t "ember-gwr.components.loginModal.username"}}
-            value={{this.username}}
-            {{on "input" this.updateValue}}
-          />
-        </div>
-        <div class="uk-width-1-2">
-          <input
-            name="password"
-            type="password"
-            class="uk-input"
-            placeholder={{t "ember-gwr.components.loginModal.password"}}
-            aria-label={{t "ember-gwr.components.loginModal.password"}}
-            value={{this.password}}
-            {{on "input" this.updateValue}}
-          />
-        </div>
-        <div class="uk-width-1">
-          <PowerSelect
-            @renderInPlace={{true}}
-            @triggerClass="uk-select"
-            @options={{this.sortedMunicipalities}}
-            @selected={{find-by "id" this.municipality this.municipalities}}
-            @placeholder={{t "ember-gwr.components.loginModal.municipality"}}
-            @searchEnabled={{true}}
-            @searchField="name"
-            @searchPlaceholder={{t
-              "ember-gwr.components.loginModal.municipalitySearch"
-            }}
-            @noMatchesMessage={{t
-              "ember-gwr.components.loginModal.municipalityNoneFound"
-            }}
-            @onChange={{this.updateMunicipality}}
-            as |municipality|
-          >
-            {{municipality.name}}
-          </PowerSelect>
-        </div>
-      </div>
-    </card.body>
-    <card.footer class="uk-text-right">
-      <UkButton
-        @color="primary"
-        @disabled={{not (and this.username this.password this.municipality)}}
-        @loading={{this.authFetch.housingStatToken.isRunning}}
-        @onClick={{this.login}}
-      >
-        {{t "ember-gwr.components.loginModal.login"}}
-      </UkButton>
-    </card.footer>
-  </UkCard>
+{{#if this.authFetch.housingStatToken.isRunning}}
+  <Loading />
 {{else}}
-  <div class="uk-flex uk-flex-middle uk-flex-right">
-    <span class="uk-margin-right">
-      {{t
-        "ember-gwr.components.loginModal.loginInfo"
-        user=this.authFetch.username
-        municipality=(get
-          (find-by "id" this.authFetch.municipality this.municipalities) "name"
-        )
-      }}
-    </span>
-    <Logout />
-  </div>
-  {{yield}}
+  {{#if this.authFetch.showAuthModal}}
+    <UkCard
+      @color="default"
+      class="ember-ebau-gwr-login uk-width-2xlarge uk-margin-auto"
+      as |card|
+    >
+      <card.header>
+        <h2 class="uk-modal-title">
+          {{t "ember-gwr.components.loginModal.header"}}
+        </h2>
+      </card.header>
+      <card.body>
+        <div class="uk-grid-small" uk-grid>
+          <div class="uk-width-1-2">
+            <input
+              name="username"
+              class="uk-input"
+              placeholder={{t "ember-gwr.components.loginModal.username"}}
+              aria-label={{t "ember-gwr.components.loginModal.username"}}
+              value={{this.username}}
+              {{on "input" this.updateValue}}
+            />
+          </div>
+          <div class="uk-width-1-2">
+            <input
+              name="password"
+              type="password"
+              class="uk-input"
+              placeholder={{t "ember-gwr.components.loginModal.password"}}
+              aria-label={{t "ember-gwr.components.loginModal.password"}}
+              value={{this.password}}
+              {{on "input" this.updateValue}}
+            />
+          </div>
+          <div class="uk-width-1">
+            <PowerSelect
+              @renderInPlace={{true}}
+              @triggerClass="uk-select"
+              @options={{this.sortedMunicipalities}}
+              @selected={{find-by "id" this.municipality this.municipalities}}
+              @placeholder={{t "ember-gwr.components.loginModal.municipality"}}
+              @searchEnabled={{true}}
+              @searchField="name"
+              @searchPlaceholder={{t
+                "ember-gwr.components.loginModal.municipalitySearch"
+              }}
+              @noMatchesMessage={{t
+                "ember-gwr.components.loginModal.municipalityNoneFound"
+              }}
+              @onChange={{this.updateMunicipality}}
+              as |municipality|
+            >
+              {{municipality.name}}
+            </PowerSelect>
+          </div>
+        </div>
+      </card.body>
+      <card.footer class="uk-text-right">
+        <UkButton
+          @color="primary"
+          @disabled={{not (and this.username this.password this.municipality)}}
+          @loading={{this.authFetch.housingStatToken.isRunning}}
+          @onClick={{this.login}}
+        >
+          {{t "ember-gwr.components.loginModal.login"}}
+        </UkButton>
+      </card.footer>
+    </UkCard>
+  {{else}}
+    <div class="uk-flex uk-flex-middle uk-flex-right">
+      <span class="uk-margin-right">
+        {{t
+          "ember-gwr.components.loginModal.loginInfo"
+          user=this.authFetch.username
+          municipality=(get
+            (find-by "id" this.authFetch.municipality this.municipalities)
+            "name"
+          )
+        }}
+      </span>
+      <Logout />
+    </div>
+    {{yield}}
+  {{/if}}
 {{/if}}
diff --git a/addon/components/project-nav.hbs b/addon/components/project-nav.hbs
index 6497cad1..1235e55f 100644
--- a/addon/components/project-nav.hbs
+++ b/addon/components/project-nav.hbs
@@ -1,8 +1,6 @@
 <div {{did-insert this.onLoad}} {{did-update this.onLoad}}>
   {{#if this.constructionProject.all.isRunning}}
-    <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-      <UkSpinner @ratio={{3}} />
-    </div>
+    <Loading />
   {{else}}
     {{#if this.displayLandingPage}}
       <ProjectLandingPage />
diff --git a/addon/services/auth-fetch.js b/addon/services/auth-fetch.js
index bab78494..f75b63d7 100644
--- a/addon/services/auth-fetch.js
+++ b/addon/services/auth-fetch.js
@@ -26,13 +26,6 @@ export default class AuthFetchService extends Service {
 
   @task
   *housingStatToken(username, password, municipality) {
-    if (
-      this.config.username &&
-      this.config.password &&
-      this.config.municipality
-    ) {
-      ({ username, password, municipality } = this.config);
-    }
     const response = yield fetch(`/api/v1/housing-stat-token`, {
       method: "post",
       headers: {
diff --git a/addon/templates/building/edit/dwelling/edit.hbs b/addon/templates/building/edit/dwelling/edit.hbs
index 5c1f0562..9574cb95 100644
--- a/addon/templates/building/edit/dwelling/edit.hbs
+++ b/addon/templates/building/edit/dwelling/edit.hbs
@@ -1,8 +1,6 @@
 <div>
   {{#if this.fetchDwelling.isRunning}}
-    <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-      <UkSpinner @ratio={{3}} />
-    </div>
+    <Loading />
   {{else}}
     <ModelForm
       @model={{this.dwelling}}
@@ -37,21 +35,20 @@
 
       <Field
         @attr="floorType"
-        @type="select" @required={{true}}
+        @type="select"
+        @required={{true}}
         @gwrEnumOptions={{this.Models.Dwelling.floorTypeOptions}}
         @hint={{t "ember-gwr.dwelling.floorHint"}}
       />
 
-      {{#if (or
-        (eq changeset.floorType 3101)
-        (eq changeset.floorType 3401)
-        (and this.import this.import.data.floorNumber)
-      )}}
-        <Field
-          @attr="floorNumber"
-          @type="number"
-          @required={{true}}
-        />
+      {{#if
+        (or
+          (eq changeset.floorType 3101)
+          (eq changeset.floorType 3401)
+          (and this.import this.import.data.floorNumber)
+        )
+      }}
+        <Field @attr="floorNumber" @type="number" @required={{true}} />
       {{/if}}
 
       <Field @attr="multipleFloor" @type="checkbox" @required={{true}} />
diff --git a/addon/templates/building/edit/dwellings.hbs b/addon/templates/building/edit/dwellings.hbs
index 79d74aa9..ddcf8838 100644
--- a/addon/templates/building/edit/dwellings.hbs
+++ b/addon/templates/building/edit/dwellings.hbs
@@ -1,8 +1,6 @@
 <div>
   {{#if this.fetchDwellings.isRunning}}
-    <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-      <UkSpinner @ratio={{3}} />
-    </div>
+    <Loading />
   {{else}}
     <LinkedModels
       @models={{this.fetchDwellings.lastSuccessful.value}}
@@ -25,7 +23,8 @@
           (t
             "ember-gwr.buildingEntrance.title"
             address=model.buildingEntrance.EDID
-          ) " - "
+          )
+          " - "
           model.buildingEntrance.fullAddressText
         }}
       </td>
@@ -50,4 +49,4 @@
       </td>
     </LinkedModels>
   {{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/addon/templates/building/edit/entrance/edit/index.hbs b/addon/templates/building/edit/entrance/edit/index.hbs
index 7857028f..45797d46 100644
--- a/addon/templates/building/edit/entrance/edit/index.hbs
+++ b/addon/templates/building/edit/entrance/edit/index.hbs
@@ -1,8 +1,6 @@
 <div>
   {{#if this.fetchBuildingEntrance.isRunning}}
-    <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-      <UkSpinner @ratio={{3}} />
-    </div>
+    <Loading />
   {{else}}
     <ModelForm
       @model={{this.buildingEntrance}}
@@ -42,19 +40,16 @@
           @disabled={{not this.buildingEntrance.isNew}}
         />
       {{/unless}}
-      {{!-- API rejects any modification of the buildingEntranceNo or isOfficial
-        fields on building entrances that are not linked to a street. --}}
+      {{! API rejects any modification of the buildingEntranceNo or isOfficial
+        fields on building entrances that are not linked to a street. }}
       <div
         uk-tooltip="title: {{if
-            this.hasNoStreet
-            (t "ember-gwr.buildingEntrance.missingStreetInfo")
-          }}
+          this.hasNoStreet
+          (t 'ember-gwr.buildingEntrance.missingStreetInfo')
+        }}
           ; container: {{this.config.modalContainer}}; pos: top-left"
       >
-        <Field
-          @attr="buildingEntranceNo"
-          @disabled={{this.hasNoStreet}}
-        />
+        <Field @attr="buildingEntranceNo" @disabled={{this.hasNoStreet}} />
         <Field
           @attr="isOfficialAddress"
           @type="checkbox"
@@ -96,4 +91,4 @@
       {{/unless}}
     </ModelForm>
   {{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/addon/templates/building/edit/entrances.hbs b/addon/templates/building/edit/entrances.hbs
index 5d667ec6..2cb4dac5 100644
--- a/addon/templates/building/edit/entrances.hbs
+++ b/addon/templates/building/edit/entrances.hbs
@@ -1,20 +1,18 @@
 <div>
   {{#if this.fetchEntrances.isRunning}}
-    <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-      <UkSpinner @ratio={{3}} />
-    </div>
+    <Loading />
   {{else}}
     <LinkedModels
       @models={{this.entrances}}
       @modelName="entrance"
       @newRoute="building.edit.entrance.new"
-      {{!--
+      {{!
       TODO removing a entrance is not allowed if there is still a dwelling attached to it
       We also cannot remove an entrance if there is only one. This only applies for active
       instances of dwellings and building entrances. Since building entrance deactivation
       is an asynchronous process, we should check the mutation status of deactivated
       building entrances and dwellings, to ensure that the requirements hold.
-      --}}
+      }}
       @removeLink={{if (gt this.entrances.length 1) this.removeEntranceLink}}
       as |model|
     >
diff --git a/addon/templates/building/edit/form.hbs b/addon/templates/building/edit/form.hbs
index 124178e9..0e755051 100644
--- a/addon/templates/building/edit/form.hbs
+++ b/addon/templates/building/edit/form.hbs
@@ -12,9 +12,7 @@
 {{/if}}
 <div>
   {{#if (or this.fetchBuildingWork.isRunning this.fetchBuilding.isRunning)}}
-    <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-      <UkSpinner @ratio={{3}} />
-    </div>
+    <Loading />
   {{else}}
     <ModelForm
       @model={{this.buildingWork}}
diff --git a/addon/templates/project/form.hbs b/addon/templates/project/form.hbs
index 22080eae..6b5e1a73 100644
--- a/addon/templates/project/form.hbs
+++ b/addon/templates/project/form.hbs
@@ -1,8 +1,6 @@
 <div>
   {{#if this.fetchProject.isRunning}}
-    <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-      <UkSpinner @ratio={{3}} />
-    </div>
+    <Loading />
   {{else}}
     <ModelForm
       @model={{this.project}}
@@ -22,7 +20,10 @@
       @onStatusCorrection={{this.correctState}}
       @getChangeParameters={{this.getChangeParameters}}
       @getCorrectionParameters={{this.getCorrectionParameters}}
-      @getChangeHint={{fn this.gwr.getChangeHint this.constructionProject.cacheClass}}
+      @getChangeHint={{fn
+        this.gwr.getChangeHint
+        this.constructionProject.cacheClass
+      }}
       @modelStatusField="projectStatus"
       as |Field changeset|
     >
@@ -65,8 +66,10 @@
         @hint={{if
           (eq this.typeOfConstructionProject 6010)
           (t "ember-gwr.linkedBuildings.buildingDisabledForInfrastructure")
-          (if (eq this.typeOfConstructionProject 6011)
-            (t "ember-gwr.linkedBuildings.superstructureInfo"))
+          (if
+            (eq this.typeOfConstructionProject 6011)
+            (t "ember-gwr.linkedBuildings.superstructureInfo")
+          )
         }}
       />
 
@@ -155,8 +158,8 @@
         class="uk-flex uk-flex-wrap
           {{if
             this.import
-            "uk-child-width-1-1"
-            "uk-child-width-1-4@l uk-child-width-1-3@m uk-child-width-1-2@s"
+            'uk-child-width-1-1'
+            'uk-child-width-1-4@l uk-child-width-1-3@m uk-child-width-1-2@s'
           }}"
       >
         {{#let
@@ -175,63 +178,96 @@
           </div>
           <div
             class="{{spacingClass}}
-              {{if (not (show-model-field
-                "buildingPermitIssueDate" changeset this.import
-              )) "uk-hidden"}}"
+              {{if
+                (not
+                  (show-model-field
+                    'buildingPermitIssueDate' changeset this.import
+                  )
+                )
+                'uk-hidden'
+              }}"
           >
             <Field @inputType="date" @attr="buildingPermitIssueDate" />
           </div>
-          <div class="{{spacingClass}}
-            {{if (not (show-model-field
-              "projectStartDate" changeset this.import
-            )) "uk-hidden"}}"
+          <div
+            class="{{spacingClass}}
+              {{if
+                (not
+                  (show-model-field 'projectStartDate' changeset this.import)
+                )
+                'uk-hidden'
+              }}"
           >
             <Field @inputType="date" @attr="projectStartDate" />
           </div>
-          <div class="{{spacingClass}}
-            {{if (not (show-model-field
-              "projectCompletionDate" changeset this.import
-            )) "uk-hidden"}}"
+          <div
+            class="{{spacingClass}}
+              {{if
+                (not
+                  (show-model-field
+                    'projectCompletionDate' changeset this.import
+                  )
+                )
+                'uk-hidden'
+              }}"
           >
             <Field @inputType="date" @attr="projectCompletionDate" />
           </div>
-          <div class="{{spacingClass}}
-            {{if (not (show-model-field
-              "projectSuspensionDate" changeset this.import
-            )) "uk-hidden"}}"
+          <div
+            class="{{spacingClass}}
+              {{if
+                (not
+                  (show-model-field
+                    'projectSuspensionDate' changeset this.import
+                  )
+                )
+                'uk-hidden'
+              }}"
           >
             <Field @inputType="date" @attr="projectSuspensionDate" />
           </div>
-          <div class="{{spacingClass}}
-            {{if (not (show-model-field
-              "constructionAuthorisationDeniedDate" changeset this.import
-            )) "uk-hidden"}}"
+          <div
+            class="{{spacingClass}}
+              {{if
+                (not
+                  (show-model-field
+                    'constructionAuthorisationDeniedDate' changeset this.import
+                  )
+                )
+                'uk-hidden'
+              }}"
           >
             <Field
               @inputType="date"
               @attr="constructionAuthorisationDeniedDate"
             />
           </div>
-          <div class="{{spacingClass}}
-            {{if (not (show-model-field
-              "cancellationDate" changeset this.import
-            )) "uk-hidden"}}"
+          <div
+            class="{{spacingClass}}
+              {{if
+                (not
+                  (show-model-field 'cancellationDate' changeset this.import)
+                )
+                'uk-hidden'
+              }}"
           >
             <Field @inputType="date" @attr="cancellationDate" />
           </div>
-          <div class="{{spacingClass}}
-            {{if (not (show-model-field
-              "withdrawalDate" changeset this.import
-            )) "uk-hidden"}}"
+          <div
+            class="{{spacingClass}}
+              {{if
+                (not (show-model-field 'withdrawalDate' changeset this.import))
+                'uk-hidden'
+              }}"
           >
             <Field @inputType="date" @attr="withdrawalDate" />
           </div>
         {{/let}}
       </div>
-      {{#if (or
-        (not this.project.isNew)
-        (show-model-field
-          "durationOfConstructionPhase" changeset this.import)
+      {{#if
+        (or
+          (not this.project.isNew)
+          (show-model-field "durationOfConstructionPhase" changeset this.import)
         )
       }}
         <Field
@@ -259,7 +295,7 @@
         @gwrEnumOptions={{this.choiceOptions.typeOfClientOptions}}
       />
       {{#if (compute this.isClientMismatch changeset)}}
-        <div class="uk-alert uk-alert-danger" >
+        <div class="uk-alert uk-alert-danger">
           {{t "ember-gwr.constructionProject.fields.typeOfClientAlert"}}
         </div>
       {{/if}}
@@ -302,7 +338,7 @@
           </div>
         </div>
       {{/if}}
-      <div class="{{unless this.import "uk-flex"}} uk-margin">
+      <div class="{{unless this.import 'uk-flex'}} uk-margin">
         <div class={{if this.import "uk-margin" "uk-width-5-6"}}>
           <Field @attr="client.address.street" @noMargin={{true}} />
         </div>
@@ -315,12 +351,20 @@
         </div>
       </div>
       <Field @attr="client.address.addressLine2" />
-      {{#if (or
-        (eq changeset.client.address.country.countryNameShort "ch")
-        (and this.import this.import.data.client.address.swissZipCode)
-      )}}
-        <div class="{{unless this.import "uk-flex"}} uk-margin">
-          <div class={{if this.import "uk-margin" "uk-width-1-2 uk-margin-small-right"}}>
+      {{#if
+        (or
+          (eq changeset.client.address.country.countryNameShort "ch")
+          (and this.import this.import.data.client.address.swissZipCode)
+        )
+      }}
+        <div class="{{unless this.import 'uk-flex'}} uk-margin">
+          <div
+            class={{if
+              this.import
+              "uk-margin"
+              "uk-width-1-2 uk-margin-small-right"
+            }}
+          >
             <Field
               @type="number"
               @attr="client.address.swissZipCode"
@@ -339,10 +383,7 @@
         changeset.client.address.country.countryNameShort
         (and this.import this.import.data.client.address.foreignZipCode)
       )}}
-        <Field
-          @type="number"
-          @attr="client.address.foreignZipCode"
-        />
+        <Field @type="number" @attr="client.address.foreignZipCode" />
       {{/if}}
       <Field
         @inputType="select"
diff --git a/addon/templates/project/linked-buildings.hbs b/addon/templates/project/linked-buildings.hbs
index 87ec8c93..bfda8f81 100644
--- a/addon/templates/project/linked-buildings.hbs
+++ b/addon/templates/project/linked-buildings.hbs
@@ -3,9 +3,7 @@
   {{did-update (perform this.fetchBuildings) @model}}
 >
   {{#if this.fetchBuildings.isRunning}}
-    <div class="uk-flex uk-flex-center uk-flex-middle uk-margin-large-top">
-      <UkSpinner @ratio={{3}} />
-    </div>
+    <Loading />
   {{else}}
     <LinkedModels
       @models={{this.fetchBuildings.lastSuccessful.value}}
@@ -40,15 +38,13 @@
       </td>
       <td>
         {{t
-          (concat
-            "ember-gwr.buildingWork.kindOfWorkOptions." model.kindOfWork
-          )
+          (concat "ember-gwr.buildingWork.kindOfWorkOptions." model.kindOfWork)
         }}
       </td>
     </LinkedModels>
     <div class="uk-flex uk-flex-middle uk-flex-center">
       <div>
-        <span uk-icon="info" class="uk-margin-small-right"/>
+        <span uk-icon="info" class="uk-margin-small-right"></span>
       </div>
       <div>
         {{t "ember-gwr.components.linkedModels.buildingInfo"}}