diff --git a/src/portal/src/app/base/account-settings/account-settings-modal.component.html b/src/portal/src/app/base/account-settings/account-settings-modal.component.html
index 6422198f3..81d9b3255 100644
--- a/src/portal/src/app/base/account-settings/account-settings-modal.component.html
+++ b/src/portal/src/app/base/account-settings/account-settings-modal.component.html
@@ -1,7 +1,7 @@
 <clr-modal [(clrModalOpen)]="opened" [clrModalStaticBackdrop]="staticBackdrop" [clrModalClosable]="false">
     <h3 class="modal-title">{{'PROFILE.TITLE' | translate}}</h3>
     <div class="modal-body body-format">
-        <inline-alert (confirmEvt)="confirmYes($event)" (closeEvt)="confirmNo($event)"></inline-alert>
+        <inline-alert #accountSettingInlineAlert (confirmEvt)="confirmYes($event)" (closeEvt)="confirmNo($event)"></inline-alert>
         <form #accountSettingsFrom="ngForm" class="clr-form clr-form-horizontal">
             <div class="clr-form-control">
                 <label for="account_settings_username" aria-haspopup="true"
@@ -75,7 +75,7 @@
                     class="btn btn-outline  btn-padding-less" *ngIf="showGenerateCli">
                     {{'PROFILE.ADMIN_CLI_SECRET_BUTTON' | translate}}
                 </button>
-                <button (click)="showSecretDetail=true" id="reset-cli-btn" class="btn btn-outline  btn-padding-less"
+                <button (click)="openSecretDetail()" id="reset-cli-btn" class="btn btn-outline  btn-padding-less"
                     *ngIf="showGenerateCli">
                     {{'PROFILE.ADMIN_CLI_SECRET_RESET_BUTTON' | translate}}
                 </button>
@@ -102,20 +102,36 @@
 
     <h3 class="modal-title">{{'PROFILE.ADMIN_CLI_SECRET_RESET_BUTTON' | translate}}</h3>
     <div class="modal-body upload-secret">
+        <inline-alert #resetSecretInlineAlert class="modal-title"></inline-alert>
         <form #resetSecretFrom="ngForm" class="clr-form reset-cli-form clr-form-horizontal">
-            <clr-input-container>
-                <label>{{'PROFILE.NEW_SECRET' | translate}}</label>
-                <input clrInput type="password" maxlength="30" size="30" required pattern="^(?=.*\d)(?=.*[a-zA-Z]).{8,}$"
-                    name="input_secret" [(ngModel)]="resetForms.input_secret" id="input-secret">
-                <clr-control-error>
-                    {{'TOOLTIP.NEW_SECRET' | translate}}
-                </clr-control-error>
-            </clr-input-container>
-            <clr-input-container>
-                <label>{{'PROFILE.CONFIRM_SECRET' | translate}}</label>
-                <input clrInput type="password" maxlength="30" size="30"
-                    [(ngModel)]="resetForms.confirm_secret" name="confirm_secret" id="confirm-secret">
-            </clr-input-container>
+            <div class="clr-form-control">
+                <label for="input-secret" class="clr-control-label">{{"SYSTEM_ROBOT.CONFIRM_SECRET" | translate}}</label>
+                <div class="clr-control-container" [class.clr-error]="(inputSecret.dirty || inputSecret.touched) && inputSecret.invalid">
+                    <div class="clr-input-wrapper">
+                        <input [type]="showInputSecret?'text':'password'" id="new-token" #inputSecret="ngModel" class="clr-input pwd-input" type="password" maxlength="30" size="30" required pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).{8,128}$"
+                                name="input_secret" [(ngModel)]="resetForms.input_secret" id="input-secret">
+                        <clr-icon *ngIf="!showInputSecret" shape="eye" class="pw-eye" (click)="showInputSecret =!showInputSecret"></clr-icon>
+                        <clr-icon *ngIf="showInputSecret" shape="eye-hide" class="pw-eye" (click)="showInputSecret =!showInputSecret"></clr-icon>
+                        <clr-icon class="clr-validate-icon" shape="exclamation-circle"></clr-icon>
+                    </div>
+                    <clr-control-error *ngIf="(inputSecret.dirty || inputSecret.touched) && inputSecret.invalid">
+                        {{'TOOLTIP.NEW_SECRET' | translate}}
+                    </clr-control-error>
+                </div>
+            </div>
+
+
+            <div class="clr-form-control">
+                <label for="confirm-secret" class="clr-control-label">{{'PROFILE.CONFIRM_SECRET' | translate}}</label>
+                <div class="clr-control-container">
+                    <div class="clr-input-wrapper">
+                        <input [type]="showConfirmSecret?'text':'password'" class="clr-input pwd-input" type="password" maxlength="30" size="30"
+                               [(ngModel)]="resetForms.confirm_secret" name="confirm_secret" id="confirm-secret">
+                        <clr-icon *ngIf="!showConfirmSecret" shape="eye" class="pw-eye" (click)="showConfirmSecret =!showConfirmSecret"></clr-icon>
+                        <clr-icon *ngIf="showConfirmSecret" shape="eye-hide" class="pw-eye" (click)="showConfirmSecret =!showConfirmSecret"></clr-icon>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">
diff --git a/src/portal/src/app/base/account-settings/account-settings-modal.component.scss b/src/portal/src/app/base/account-settings/account-settings-modal.component.scss
index a2a0a4f67..6738bee0c 100644
--- a/src/portal/src/app/base/account-settings/account-settings-modal.component.scss
+++ b/src/portal/src/app/base/account-settings/account-settings-modal.component.scss
@@ -47,5 +47,13 @@ clr-modal {
     display: flex;
 }
 :host::ng-deep.upload-secret {
-    width: 23rem;
+    width: 24.5rem;
+}
+.pwd-input {
+    padding-right: 26px;
+}
+.pw-eye {
+    margin-left: -20px;
+    margin-right: 8px;
+    cursor: pointer;
 }
diff --git a/src/portal/src/app/base/account-settings/account-settings-modal.component.ts b/src/portal/src/app/base/account-settings/account-settings-modal.component.ts
index bc59983e5..a3fcc1f7b 100644
--- a/src/portal/src/app/base/account-settings/account-settings-modal.component.ts
+++ b/src/portal/src/app/base/account-settings/account-settings-modal.component.ts
@@ -58,9 +58,11 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked {
   accountFormRef: NgForm;
   @ViewChild("accountSettingsFrom", {static: true}) accountForm: NgForm;
   @ViewChild("resetSecretFrom", {static: true}) resetSecretFrom: NgForm;
-  @ViewChild(InlineAlertComponent) inlineAlert: InlineAlertComponent;
+  @ViewChild("accountSettingInlineAlert") inlineAlert: InlineAlertComponent;
+  @ViewChild("resetSecretInlineAlert") resetSecretInlineAlert: InlineAlertComponent;
   @ViewChild("copyInput") copyInput: CopyInputComponent;
-
+  showInputSecret: boolean = false;
+  showConfirmSecret: boolean = false;
   constructor(
     private session: SessionService,
     private msgHandler: MessageHandlerService,
@@ -364,7 +366,7 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked {
       this.closeReset();
       this.inlineAlert.showInlineSuccess({message: 'PROFILE.GENERATE_SUCCESS'});
     }, error => {
-      this.inlineAlert.showInlineError({message: 'PROFILE.GENERATE_ERROR'});
+      this.resetSecretInlineAlert.showInlineError({message: 'PROFILE.GENERATE_ERROR'});
     });
   }
   disableChangeCliSecret() {
@@ -375,4 +377,8 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked {
     this.showGenerateCliFn();
     this.resetSecretFrom.resetForm(new ResetSecret());
   }
+  openSecretDetail() {
+    this.showSecretDetail = true;
+    this.resetSecretInlineAlert.close();
+  }
 }
diff --git a/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html
index 9382662b9..3f925a429 100644
--- a/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html
+++ b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html
@@ -83,7 +83,7 @@
                 </clr-tooltip>
             </label>
             <clr-checkbox-wrapper>
-                <input type="checkbox" clrCheckbox name="repoReadOnly" id="repoReadOnly"
+                <input type="checkbox" [disabled]="!systemSettings.read_only.editable"  clrCheckbox name="repoReadOnly" id="repoReadOnly"
                     [ngModel]="systemSettings.read_only.value" (ngModelChange)="setRepoReadOnlyValue($event)" />
             </clr-checkbox-wrapper>
         </clr-checkbox-container>
@@ -175,7 +175,7 @@
                 <input type="checkbox" clrCheckbox name="webhookNotificationEnabled" id="webhookNotificationEnabled"
                     [ngModel]="systemSettings.notification_enable.value"
                     (ngModelChange)="setWebhookNotificationEnabledValue($event)"
-                    [ngModel]="systemSettings.notification_enable.value" />
+                    [disabled]="!systemSettings.notification_enable.editable" />
             </clr-checkbox-wrapper>
         </clr-checkbox-container>
     </section>
diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
index 0003ec2e2..563527c1c 100644
--- a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
+++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
@@ -128,14 +128,7 @@
       </div>
       <!--destination registry-->
       <div *ngIf="isPushMode" class="clr-form-control">
-        <label class="clr-control-label  required">{{'REPLICATION.DEST_REGISTRY' | translate}}
-          <clr-tooltip>
-            <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
-            <clr-tooltip-content clrPosition="top-left" clrSize="md" *clrIfOpen>
-              <span>{{'TOOLTIP.DESTINATION_NAMESPACE' | translate}}</span>
-            </clr-tooltip-content>
-          </clr-tooltip>
-        </label>
+        <label class="clr-control-label  required">{{'REPLICATION.DEST_REGISTRY' | translate}}</label>
         <div class="form-select clr-control-container">
           <div class="clr-select-wrapper">
             <select class="clr-select select-width" id="dest_registry" (change)="targetChange($event)" formControlName="dest_registry"
@@ -192,6 +185,7 @@
                   <div>{{'REPLICATION.FLATTEN_LEVEL_TIP_1' | translate}}</div>
                   <div>{{'REPLICATION.FLATTEN_LEVEL_TIP_2' | translate}}</div>
                   <div>{{'REPLICATION.FLATTEN_LEVEL_TIP_3' | translate}}</div>
+                  <div>{{'REPLICATION.NOTE' | translate}}</div>
                 </clr-tooltip-content>
               </clr-tooltip>
             </div>
diff --git a/src/portal/src/app/base/project/project-detail/project-detail.component.html b/src/portal/src/app/base/project/project-detail/project-detail.component.html
index a4d9883e3..d44638245 100644
--- a/src/portal/src/app/base/project/project-detail/project-detail.component.html
+++ b/src/portal/src/app/base/project/project-detail/project-detail.component.html
@@ -7,7 +7,7 @@
             <clr-icon *ngIf="isProxyCacheProject" shape="cloud-traffic" size="30"></clr-icon>
             <clr-icon *ngIf="!isProxyCacheProject" shape="organization" size="30"></clr-icon>
             <span class="ml-05">{{currentProject.name}}</span>
-            <div class="divider filter-divider"></div>
+            <div class="divider filter-divider" *ngIf="isMember"></div>
             <span class="role-label" *ngIf="isMember">{{roleName | translate}}</span>
         </h1>
         <div class="clr-row mt-0 line-height-10" *ngIf="isProxyCacheProject">
diff --git a/src/portal/src/app/shared/components/global-message/message.component.ts b/src/portal/src/app/shared/components/global-message/message.component.ts
index 427d9d7e8..7fdc09b36 100644
--- a/src/portal/src/app/shared/components/global-message/message.component.ts
+++ b/src/portal/src/app/shared/components/global-message/message.component.ts
@@ -70,6 +70,10 @@ export class MessageComponent implements OnInit, OnDestroy {
 
           // Make the message alert bar dismiss after several intervals.
           // Only for this case
+          if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+          }
           this.timer = setTimeout(() => this.onClose(), dismissInterval);
 
           // Hack the Clarity Alert style with native dom
diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json
index e2660ef74..90177032b 100644
--- a/src/portal/src/i18n/lang/de-de-lang.json
+++ b/src/portal/src/i18n/lang/de-de-lang.json
@@ -642,7 +642,8 @@
         "FLATTEN_LEVEL_TIP_NO": "'No Flatting': 'a/b/c/d/img' -> 'ns/a/b/c/d/img",
         "FLATTEN_LEVEL_TIP_1": "'Flatten 1 Level'(Default): 'a/b/c/d/img' -> 'ns/b/c/d/img'",
         "FLATTEN_LEVEL_TIP_2": "'Flatten 2 Levels': 'a/b/c/d/img' -> 'ns/c/d/img'",
-        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'"
+        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'",
+        "NOTE": "Notes: The Chartmuseum Charts only support the repository structure with 2 path components: `a/chart`"
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "Neuer Endpunkt",
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index b31831779..ebbbafdf0 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -642,7 +642,8 @@
         "FLATTEN_LEVEL_TIP_NO": "'No Flatting': 'a/b/c/d/img' -> 'ns/a/b/c/d/img",
         "FLATTEN_LEVEL_TIP_1": "'Flatten 1 Level'(Default): 'a/b/c/d/img' -> 'ns/b/c/d/img'",
         "FLATTEN_LEVEL_TIP_2": "'Flatten 2 Levels': 'a/b/c/d/img' -> 'ns/c/d/img'",
-        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'"
+        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'",
+        "NOTE": "Notes: The Chartmuseum Charts only support the repository structure with 2 path components: `a/chart`"
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "New Endpoint",
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index f221d28d4..1b43799d6 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -643,7 +643,8 @@
         "FLATTEN_LEVEL_TIP_NO": "'No Flatting': 'a/b/c/d/img' -> 'ns/a/b/c/d/img",
         "FLATTEN_LEVEL_TIP_1": "'Flatten 1 Level'(Default): 'a/b/c/d/img' -> 'ns/b/c/d/img'",
         "FLATTEN_LEVEL_TIP_2": "'Flatten 2 Levels': 'a/b/c/d/img' -> 'ns/c/d/img'",
-        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'"
+        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'",
+        "NOTE": "Notes: The Chartmuseum Charts only support the repository structure with 2 path components: `a/chart`"
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "Nuevo Endpoint",
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index 460cf145e..78d176a2c 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -632,7 +632,8 @@
         "FLATTEN_LEVEL_TIP_NO": "'No Flatting': 'a/b/c/d/img' -> 'ns/a/b/c/d/img",
         "FLATTEN_LEVEL_TIP_1": "'Flatten 1 Level'(Default): 'a/b/c/d/img' -> 'ns/b/c/d/img'",
         "FLATTEN_LEVEL_TIP_2": "'Flatten 2 Levels': 'a/b/c/d/img' -> 'ns/c/d/img'",
-        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'"
+        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'",
+        "NOTE": "Notes: The Chartmuseum Charts only support the repository structure with 2 path components: `a/chart`"
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "Nouveau Point Final",
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
index 6fd12e119..c3e5bd6ad 100644
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -642,7 +642,8 @@
         "FLATTEN_LEVEL_TIP_NO": "'No Flatting': 'a/b/c/d/img' -> 'ns/a/b/c/d/img",
         "FLATTEN_LEVEL_TIP_1": "'Flatten 1 Level'(Default): 'a/b/c/d/img' -> 'ns/b/c/d/img'",
         "FLATTEN_LEVEL_TIP_2": "'Flatten 2 Levels': 'a/b/c/d/img' -> 'ns/c/d/img'",
-        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'"
+        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'",
+        "NOTE": "Notes: The Chartmuseum Charts only support the repository structure with 2 path components: `a/chart`"
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "Novo Endpoint",
diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json
index dc36e68cb..87b4dfae2 100644
--- a/src/portal/src/i18n/lang/tr-tr-lang.json
+++ b/src/portal/src/i18n/lang/tr-tr-lang.json
@@ -642,7 +642,8 @@
         "FLATTEN_LEVEL_TIP_NO": "'No Flatting': 'a/b/c/d/img' -> 'ns/a/b/c/d/img",
         "FLATTEN_LEVEL_TIP_1": "'Flatten 1 Level'(Default): 'a/b/c/d/img' -> 'ns/b/c/d/img'",
         "FLATTEN_LEVEL_TIP_2": "'Flatten 2 Levels': 'a/b/c/d/img' -> 'ns/c/d/img'",
-        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'"
+        "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'",
+        "NOTE": "Notes: The Chartmuseum Charts only support the repository structure with 2 path components: `a/chart`"
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "Yeni Uç Nokta",
diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
index 036ad8c06..07af21e58 100644
--- a/src/portal/src/i18n/lang/zh-cn-lang.json
+++ b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -644,7 +644,8 @@
         "FLATTEN_LEVEL_TIP_NO": "'无替换': 'a/b/c/d/img' -> 'ns/a/b/c/d/img",
         "FLATTEN_LEVEL_TIP_1": "'替换1级'(默认项): 'a/b/c/d/img' -> 'ns/b/c/d/img'",
         "FLATTEN_LEVEL_TIP_2": "'替换2级': 'a/b/c/d/img' -> 'ns/c/d/img'",
-        "FLATTEN_LEVEL_TIP_3": "'替换3级': 'a/b/c/d/img' -> 'ns/d/img'"
+        "FLATTEN_LEVEL_TIP_3": "'替换3级': 'a/b/c/d/img' -> 'ns/d/img'",
+        "NOTE": "注意: Chartmuseum Charts 仅支持2层的仓库结构：如 `a/chart`"
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "新建目标",
diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json
index 04ccf59d0..cb8c24f73 100644
--- a/src/portal/src/i18n/lang/zh-tw-lang.json
+++ b/src/portal/src/i18n/lang/zh-tw-lang.json
@@ -639,7 +639,8 @@
     "FLATTEN_LEVEL_TIP_NO": "'No Flatting': 'a/b/c/d/img' -> 'ns/a/b/c/d/img",
     "FLATTEN_LEVEL_TIP_1": "'Flatten 1 Level'(Default): 'a/b/c/d/img' -> 'ns/b/c/d/img'",
     "FLATTEN_LEVEL_TIP_2": "'Flatten 2 Levels': 'a/b/c/d/img' -> 'ns/c/d/img'",
-    "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'"
+    "FLATTEN_LEVEL_TIP_3": "'Flatten 3 Levels': 'a/b/c/d/img' -> 'ns/d/img'",
+    "NOTE": "Notes: The Chartmuseum Charts only support the repository structure with 2 path components: `a/chart`"
   },
   "DESTINATION":{
     "NEW_ENDPOINT": "新建目標",