diff --git a/src/app/product-store/app-detail/app-detail.component.ts b/src/app/product-store/app-detail/app-detail.component.ts
index bbcc469..e79ab71 100644
--- a/src/app/product-store/app-detail/app-detail.component.ts
+++ b/src/app/product-store/app-detail/app-detail.component.ts
@@ -102,7 +102,7 @@ export class AppDetailComponent implements OnChanges {
             this.app = data
             this.viewForm(this.app)
             if (this.changeMode === 'COPY') {
-              if (this.app && this.app.id) {
+              if (this.app?.id) {
                 this.app.id = undefined
                 this.app.creationDate = undefined
                 this.app.modificationDate = undefined
@@ -179,16 +179,18 @@ export class AppDetailComponent implements OnChanges {
   }
 
   private displaySaveError(err: any): void {
+    let key = err?.error?.detail.indexOf('microfrontend_app_id') > 0 ? 'VALIDATION.APP.UNIQUE_CONSTRAINT.APP_ID' : ''
+    key =
+      err?.error?.detail.indexOf('microfrontend_remote_module') > 0
+        ? 'VALIDATION.APP.UNIQUE_CONSTRAINT.REMOTE_MODULE'
+        : key
+
     this.msgService.error({
       summaryKey: 'ACTIONS.' + this.changeMode + '.APP.NOK',
       detailKey:
         err?.error?.errorCode && err?.error?.errorCode === 'PERSIST_ENTITY_FAILED'
-          ? err?.error?.detail.indexOf('microfrontend_app_id') > 0
-            ? 'VALIDATION.APP.UNIQUE_CONSTRAINT.APP_ID'
-            : err?.error?.detail.indexOf('microfrontend_remote_module') > 0
-            ? 'VALIDATION.APP.UNIQUE_CONSTRAINT.REMOTE_MODULE'
-            : 'VALIDATION.ERRORS.INTERNAL_ERROR'
-          : ''
+          ? key
+          : 'VALIDATION.ERRORS.INTERNAL_ERROR'
     })
     console.error('err', err)
   }
diff --git a/src/app/product-store/product-detail/product-apps/product-apps.component.html b/src/app/product-store/product-detail/product-apps/product-apps.component.html
index 137dcf3..5191ef1 100644
--- a/src/app/product-store/product-detail/product-apps/product-apps.component.html
+++ b/src/app/product-store/product-detail/product-apps/product-apps.component.html
@@ -36,16 +36,6 @@
       </ocx-data-view-controls
     ></ng-template>
     <ng-template let-app pTemplate="gridItem">
-      <!--
-      <div
-        class="col-12 grid grid-nogutter align-items-center row-gap-1 listview-row p-1 hover:bg-gray-200 cursor-pointer"
-      >
-        <div class="col-12 md:col-5 lg:col-5 xl:col-6">
-          <div class="flex flex-column justify-content-center gap-1 text-center md:text-left">
-            <div>{{ limitText(app.appName, 50) }}</div>
-          </div>
-        </div>
-      </div-->
       <div class="col-12 sm:col-6 md:col-4 lg:col-4 xl:col-3 p-3" (click)="onDetail($event, app)">
         <div class="card relative p-1 flex flex-column justify-content-center hover:bg-gray-200 cursor-pointer">
           <span