diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
index 848e815..0c25b2a 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
@@ -416,135 +416,139 @@
 
             <div class="fault-location-container">
               <div class="NS-fields" *ngIf="failureLocationView === Globals.FAILURE_LOCATION_NS">
-                <!-- city -->
-                <div class="form-group row">
-                  <label for="city" class="col-sm-5 col-form-label">{{ 'GridFailure.City' | translate }}</label>
-                  <div class="col-sm-6">
-                    <select
-                      [required]="
-                        gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
-                      "
-                      type="text"
-                      class="form-control"
-                      id="city"
-                      name="city"
-                      [ngrxFormControlState]="formState.controls['city']"
-                    >
-                      <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
-                      <option *ngFor="let item of gridFailureDetailsSandbox.addressCommunities$ | async" [value]="item">{{ item }}</option>
-                    </select>
+                <div>
+                  <!-- city -->
+                  <div class="form-group row">
+                    <label for="city" class="col-sm-5 col-form-label">{{ 'GridFailure.City' | translate }}</label>
+                    <div class="col-sm-6">
+                      <select
+                        [required]="
+                          gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
+                        "
+                        type="text"
+                        class="form-control"
+                        id="city"
+                        name="city"
+                        [ngrxFormControlState]="formState.controls['city']"
+                      >
+                        <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
+                        <option *ngFor="let item of gridFailureDetailsSandbox.addressCommunities$ | async" [value]="item">{{ item }}</option>
+                      </select>
+                    </div>
                   </div>
-                </div>
 
-                <!-- district -->
-                <div class="form-group row">
-                  <label for="district" class="col-sm-5 col-form-label">{{ 'GridFailure.District' | translate }}</label>
-                  <div class="col-sm-6">
-                    <select
-                      [required]="
-                        gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
-                      "
-                      type="text"
-                      class="form-control"
-                      id="district"
-                      name="district"
-                      [ngrxFormControlState]="formState.controls['district']"
-                    >
-                      <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
-                      <option *ngFor="let item of gridFailureDetailsSandbox.addressDistricts$ | async" [value]="item">{{ item }}</option>
-                    </select>
+                  <!-- district -->
+                  <div class="form-group row">
+                    <label for="district" class="col-sm-5 col-form-label">{{ 'GridFailure.District' | translate }}</label>
+                    <div class="col-sm-6">
+                      <select
+                        [required]="
+                          gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
+                        "
+                        type="text"
+                        class="form-control"
+                        id="district"
+                        name="district"
+                        [ngrxFormControlState]="formState.controls['district']"
+                      >
+                        <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
+                        <option *ngFor="let item of gridFailureDetailsSandbox.addressDistricts$ | async" [value]="item">{{ item }}</option>
+                      </select>
+                    </div>
                   </div>
-                </div>
 
-                <!-- postcode -->
-                <div class="form-group row">
-                  <label for="postcode" class="col-sm-5 col-form-label">{{ 'GridFailure.Postcode' | translate }}</label>
-                  <div class="col-sm-6">
-                    <select
-                      [required]="
-                        gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
-                      "
-                      type="text"
-                      maxlength="255"
-                      class="form-control"
-                      id="postcode"
-                      name="postcode"
-                      [ngrxFormControlState]="formState.controls['postcode']"
-                    >
-                      <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
-                      <option *ngFor="let item of gridFailureDetailsSandbox.addressPostCodes$ | async" [value]="item">{{ item }}</option>
-                    </select>
+                  <!-- postcode -->
+                  <div class="form-group row">
+                    <label for="postcode" class="col-sm-5 col-form-label">{{ 'GridFailure.Postcode' | translate }}</label>
+                    <div class="col-sm-6">
+                      <select
+                        [required]="
+                          gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
+                        "
+                        type="text"
+                        maxlength="255"
+                        class="form-control"
+                        id="postcode"
+                        name="postcode"
+                        [ngrxFormControlState]="formState.controls['postcode']"
+                      >
+                        <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
+                        <option *ngFor="let item of gridFailureDetailsSandbox.addressPostCodes$ | async" [value]="item">{{ item }}</option>
+                      </select>
+                    </div>
                   </div>
-                </div>
 
-                <!-- street -->
-                <div class="form-group row">
-                  <label for="street" class="col-sm-5 col-form-label">{{ 'GridFailure.Street' | translate }}</label>
-                  <div class="col-sm-6">
-                    <select
-                      [required]="
-                        gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
-                      "
-                      type="text"
-                      class="form-control"
-                      id="street"
-                      [ngrxFormControlState]="formState.controls['street']"
-                    >
-                      <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
-                      <option *ngFor="let item of gridFailureDetailsSandbox.addressStreets$ | async" [value]="item">{{ item }}</option>
-                    </select>
+                  <!-- street -->
+                  <div class="form-group row">
+                    <label for="street" class="col-sm-5 col-form-label">{{ 'GridFailure.Street' | translate }}</label>
+                    <div class="col-sm-6">
+                      <select
+                        [required]="
+                          gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
+                        "
+                        type="text"
+                        class="form-control"
+                        id="street"
+                        [ngrxFormControlState]="formState.controls['street']"
+                      >
+                        <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
+                        <option *ngFor="let item of gridFailureDetailsSandbox.addressStreets$ | async" [value]="item">{{ item }}</option>
+                      </select>
+                    </div>
                   </div>
-                </div>
 
-                <!-- housenumber -->
-                <div class="form-group row">
-                  <label for="housenumber" class="col-sm-5 col-form-label">{{ 'GridFailure.Housenumber' | translate }}</label>
-                  <div class="col-sm-6">
-                    <select
-                      [required]="
-                        gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
-                      "
-                      type="text"
-                      class="form-control"
-                      id="housenumber"
-                      [ngrxFormControlState]="formState.controls['housenumber']"
-                    >
-                      <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
-                      <option *ngFor="let housenumber of gridFailureDetailsSandbox.addressHouseNumbers$ | async" [value]="housenumber">
-                        {{ housenumber }}
-                      </option>
-                    </select>
+                  <!-- housenumber -->
+                  <div class="form-group row">
+                    <label for="housenumber" class="col-sm-5 col-form-label">{{ 'GridFailure.Housenumber' | translate }}</label>
+                    <div class="col-sm-6">
+                      <select
+                        [required]="
+                          gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
+                        "
+                        type="text"
+                        class="form-control"
+                        id="housenumber"
+                        [ngrxFormControlState]="formState.controls['housenumber']"
+                      >
+                        <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
+                        <option *ngFor="let housenumber of gridFailureDetailsSandbox.addressHouseNumbers$ | async" [value]="housenumber">
+                          {{ housenumber }}
+                        </option>
+                      </select>
+                    </div>
                   </div>
-                </div>
 
-                <!-- radius -->
-                <div class="form-group row">
-                  <label for="radius" class="col-sm-5 col-form-label">{{ 'GridFailure.RadiusInMeter' | translate }}</label>
-                  <div class="col-sm-6">
-                    <select
-                      [required]="
-                        gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
-                      "
-                      type="text"
-                      class="form-control"
-                      [ngrxFormControlState]="formState.controls['radiusId']"
-                    >
-                      <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
-                      <option *ngFor="let item of gridFailureDetailsSandbox.gridFailureRadii$ | async" [value]="item.id">{{ item.radius }}</option>
-                    </select>
+                  <!-- radius -->
+                  <div class="form-group row">
+                    <label for="radius" class="col-sm-5 col-form-label">{{ 'GridFailure.RadiusInMeter' | translate }}</label>
+                    <div class="col-sm-6">
+                      <select
+                        [required]="
+                          gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
+                        "
+                        type="text"
+                        class="form-control"
+                        [ngrxFormControlState]="formState.controls['radiusId']"
+                      >
+                        <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
+                        <option *ngFor="let item of gridFailureDetailsSandbox.gridFailureRadii$ | async" [value]="item.id">{{ item.radius }}</option>
+                      </select>
+                    </div>
                   </div>
                 </div>
-                <label
-                  class="readOnly"
-                  *ngIf="
-                    !!formState.value.id &&
-                    formState.value.statusIntern !== StateEnum.QUALIFIED &&
-                    formState.value.statusIntern !== StateEnum.CANCELED &&
-                    formState.value.statusIntern !== StateEnum.COMPLETED
-                  "
-                  >Aktuelle Adresse: <br />
-                  {{ currentAddress }}</label
-                >
+                <div>
+                  <label
+                    class="readOnly"
+                    *ngIf="
+                      !!formState.value.id &&
+                      formState.value.statusIntern !== StateEnum.QUALIFIED &&
+                      formState.value.statusIntern !== StateEnum.CANCELED &&
+                      formState.value.statusIntern !== StateEnum.COMPLETED
+                    "
+                    >Aktuelle Adresse: <br />
+                    {{ currentAddress }}</label
+                  >
+                </div>
               </div>
 
               <div class="MS-fields" *ngIf="failureLocationView === Globals.FAILURE_LOCATION_MS && !!gridFailureDetailsSandbox.gridFailureStations">
@@ -596,55 +600,57 @@
               </div>
 
               <div class="NS-fields" *ngIf="failureLocationView === Globals.FAILURE_LOCATION_MAP">
-                <!-- freetext city -->
-                <div class="form-group row">
-                  <label for="city" class="col-sm-5 col-form-label">{{ 'GridFailure.City' | translate }}</label>
-                  <div class="col-sm-6">
-                    <input type="text" maxlength="255" class="form-control" id="freetextCity" [ngrxFormControlState]="formState.controls['freetextCity']" />
+                <div>
+                  <!-- freetext city -->
+                  <div class="form-group row">
+                    <label for="city" class="col-sm-5 col-form-label">{{ 'GridFailure.City' | translate }}</label>
+                    <div class="col-sm-6">
+                      <input type="text" maxlength="255" class="form-control" id="freetextCity" [ngrxFormControlState]="formState.controls['freetextCity']" />
+                    </div>
                   </div>
-                </div>
-                <!-- freetext district -->
-                <div class="form-group row">
-                  <label for="district" class="col-sm-5 col-form-label">{{ 'GridFailure.District' | translate }}</label>
-                  <div class="col-sm-6">
-                    <input
-                      type="text"
-                      maxlength="255"
-                      class="form-control"
-                      id="freetextDistrict"
-                      [ngrxFormControlState]="formState.controls['freetextDistrict']"
-                    />
+                  <!-- freetext district -->
+                  <div class="form-group row">
+                    <label for="district" class="col-sm-5 col-form-label">{{ 'GridFailure.District' | translate }}</label>
+                    <div class="col-sm-6">
+                      <input
+                        type="text"
+                        maxlength="255"
+                        class="form-control"
+                        id="freetextDistrict"
+                        [ngrxFormControlState]="formState.controls['freetextDistrict']"
+                      />
+                    </div>
                   </div>
-                </div>
-                <!-- freetext postcode -->
-                <div class="form-group row">
-                  <label for="postcode" class="col-sm-5 col-form-label">{{ 'GridFailure.Postcode' | translate }}</label>
-                  <div class="col-sm-6">
-                    <input
-                      type="text"
-                      maxlength="5"
-                      class="form-control"
-                      id="freetextPostcode"
-                      [ngrxFormControlState]="formState.controls['freetextPostcode']"
-                    />
+                  <!-- freetext postcode -->
+                  <div class="form-group row">
+                    <label for="postcode" class="col-sm-5 col-form-label">{{ 'GridFailure.Postcode' | translate }}</label>
+                    <div class="col-sm-6">
+                      <input
+                        type="text"
+                        maxlength="5"
+                        class="form-control"
+                        id="freetextPostcode"
+                        [ngrxFormControlState]="formState.controls['freetextPostcode']"
+                      />
+                    </div>
                   </div>
-                </div>
 
-                <!-- radius -->
-                <div class="form-group row">
-                  <label for="radius" class="col-sm-5 col-form-label">{{ 'GridFailure.RadiusInMeter' | translate }}</label>
-                  <div class="col-sm-6">
-                    <select
-                      [required]="
-                        gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
-                      "
-                      type="text"
-                      class="form-control"
-                      [ngrxFormControlState]="formState.controls['radiusId']"
-                    >
-                      <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
-                      <option *ngFor="let item of gridFailureDetailsSandbox.gridFailureRadii$ | async" [value]="item.id">{{ item.radius }}</option>
-                    </select>
+                  <!-- radius -->
+                  <div class="form-group row">
+                    <label for="radius" class="col-sm-5 col-form-label">{{ 'GridFailure.RadiusInMeter' | translate }}</label>
+                    <div class="col-sm-6">
+                      <select
+                        [required]="
+                          gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion && !formState.isDisabled
+                        "
+                        type="text"
+                        class="form-control"
+                        [ngrxFormControlState]="formState.controls['radiusId']"
+                      >
+                        <option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
+                        <option *ngFor="let item of gridFailureDetailsSandbox.gridFailureRadii$ | async" [value]="item.id">{{ item.radius }}</option>
+                      </select>
+                    </div>
                   </div>
                 </div>
               </div>
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss
index 04d6198..09e97e2 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss
@@ -109,6 +109,9 @@
 
 .NS-fields,
 .MS-fields {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
   min-width: 480px;
 }
 
@@ -139,6 +142,6 @@
   border: 1px solid;
   padding: 15px 30px;
   width: -webkit-fill-available;
-  margin-right: 42px;
+  margin: 0px 42px 0px 0px;
   color: grey;
 }
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.ts
index 164ac0a..bf6dcb0 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.ts
@@ -91,11 +91,25 @@
 
     this.gridFailureDetailsSandbox.gridFailureDetailsFormState$
       .pipe(
-        skipWhile(item => !item.value.housenumber),
+        skipWhile(item => !item.value.postcode && !item.value.city && !item.value.district && !item.value.street && !item.value.housenumber),
         take(1)
       )
       .subscribe(girdFailure => {
-        this.currentAddress = `${girdFailure.value.postcode} ${girdFailure.value.city} (${girdFailure.value.district}), ${girdFailure.value.street} ${girdFailure.value.housenumber}`;
+        if (girdFailure.value.postcode) {
+          this.currentAddress += `${girdFailure.value.postcode} `;
+        }
+        if (girdFailure.value.city) {
+          this.currentAddress += `${girdFailure.value.city} `;
+        }
+        if (girdFailure.value.district) {
+          this.currentAddress += `(${girdFailure.value.district})`;
+        }
+        if (girdFailure.value.street) {
+          this.currentAddress += `, ${girdFailure.value.street} `;
+        }
+        if (girdFailure.value.housenumber) {
+          this.currentAddress += `${girdFailure.value.housenumber}`;
+        }
       });
   }
   public setBranchValue(branchId: string) {