diff --git a/src/portal/src/app/base/base.module.ts b/src/portal/src/app/base/base.module.ts
index ecda2a7b1e7..6beb77fe643 100644
--- a/src/portal/src/app/base/base.module.ts
+++ b/src/portal/src/app/base/base.module.ts
@@ -20,7 +20,6 @@ import { MemberGuard } from '../shared/router-guard/member-guard-activate.servic
 import { ProjectRoutingResolver } from '../services/routing-resolvers/project-routing-resolver.service';
 import { PasswordSettingComponent } from './password-setting/password-setting.component';
 import { AccountSettingsModalComponent } from './account-settings/account-settings-modal.component';
-import { PreferenceSettingsComponent } from './preference-settings/preference-settings.component';
 import { ForgotPasswordComponent } from './password-setting/forgot-password/forgot-password.component';
 import { GlobalConfirmationDialogComponent } from './global-confirmation-dialog/global-confirmation-dialog.component';
 
diff --git a/src/portal/src/app/base/preference-settings/preference-settings.component.scss b/src/portal/src/app/base/preference-settings/preference-settings.component.scss
index 4df3f0c05fa..d2da35f9a46 100644
--- a/src/portal/src/app/base/preference-settings/preference-settings.component.scss
+++ b/src/portal/src/app/base/preference-settings/preference-settings.component.scss
@@ -1,46 +1,6 @@
-.sign-in-override {
-    padding-left: 0 !important;
-    padding-right: 5px !important;
-}
-
-.sign-up-override {
-    padding-left: 5px !important;
-}
-
-.custom-divider {
-    display: inline-block;
-    border-right: 2px inset snow;
-    padding: 2px 0;
-    vertical-align: middle;
-    height: 24px;
-}
-
 .locale-selected {
     font-weight: bold;
 }
-
-.nav-divider {
-    display: inline-block;
-    width: 1px;
-    height: 20px;
-    background-color: #fafafa;
-    position: relative;
-    opacity: 0.15;
-    content: '';
-}
-
-.nav-about-link {
-    padding-left: 1.6rem !important;
-    padding-right: 1rem !important;
-    min-width: 125px;
-    text-align: left !important;
-}
-
-.harbor-logo {
-    width: 40px;
-    margin-right: 15px;
-}
-
 .nav-icon-width {
     width: auto !important;
     padding-left: 18px !important;
@@ -69,21 +29,3 @@
     align-items: start;
     gap: 20px;
 }
-
-.user-icon {
-    left: -2px;
-}
-
-.headerLogo {
-    width: 36px;
-    height: 36px;
-    object-fit: fill;
-}
-
-.dropdown-item {
-    outline: none;
-}
-
-.user-down {
-    right: 1rem !important;
-}
diff --git a/src/portal/src/app/base/preference-settings/preference-settings.component.ts b/src/portal/src/app/base/preference-settings/preference-settings.component.ts
index b5b37f2898d..d7045e16aaf 100644
--- a/src/portal/src/app/base/preference-settings/preference-settings.component.ts
+++ b/src/portal/src/app/base/preference-settings/preference-settings.component.ts
@@ -135,8 +135,6 @@ export class PreferenceSettingsComponent implements OnInit {
     switchRuntime(runtime: SupportedRuntime): void {
         this.selectedRuntime = runtime;
         localStorage.setItem(DEFAULT_RUNTIME_LOCALSTORAGE_KEY, runtime);
-        // have to reload,as HarborDatetimePipe is pure pipe
-        // window.location.reload();
     }
 
     switchDatetimeRendering(datetime: DatetimeRendering): void {
diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
index 70d9a290bfa..12e18e7cef2 100644
--- a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
+++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
@@ -197,7 +197,7 @@
                 </div>
             </clr-dg-action-bar>
 
-            <clr-dg-column class="" [clrDgSortBy]="'digest'"
+            <clr-dg-column [clrDgSortBy]="'digest'"
                 ><ng-template
                     [clrDgHideableColumn]="{ hidden: hiddenArray[0] }">
                     {{ 'REPOSITORY.ARTIFACTS_COUNT' | translate }}
@@ -260,7 +260,7 @@
             <clr-dg-row
                 *ngFor="let artifact of artifactList; let i = index"
                 [clrDgItem]="artifact">
-                <clr-dg-cell class="">
+                <clr-dg-cell>
                     <div class="cell white-normal">
                         <div
                             class="artifact-icon clr-display-inline-block"
diff --git a/src/portal/src/app/base/project/repository/artifact/artifact.ts b/src/portal/src/app/base/project/repository/artifact/artifact.ts
index 90a2334f7e7..8aadc20315b 100644
--- a/src/portal/src/app/base/project/repository/artifact/artifact.ts
+++ b/src/portal/src/app/base/project/repository/artifact/artifact.ts
@@ -170,16 +170,6 @@ export enum Clients {
     CNAB = 'cnab-to-oci',
 }
 
-export enum ClientNames {
-    DOCKER = 'Docker',
-    PODMAN = 'Podman',
-    NERDCTL = 'nerdctl',
-    CONTAINERD = 'ctr',
-    CRI_O = 'crictl',
-    CHART = 'Helm',
-    CNAB = 'CNAB',
-}
-
 export enum ArtifactSbomType {
     SPDX = 'SPDX',
 }
diff --git a/src/portal/src/app/shared/components/navigator/navigator.component.html b/src/portal/src/app/shared/components/navigator/navigator.component.html
index c8424557583..5f4e3a25247 100644
--- a/src/portal/src/app/shared/components/navigator/navigator.component.html
+++ b/src/portal/src/app/shared/components/navigator/navigator.component.html
@@ -87,6 +87,7 @@
                     >{{ 'ACCOUNT_SETTINGS.PREFERENCES' | translate }}</a
                 >
                 <a
+                    *ngIf="canChangePassword"
                     href="javascript:void(0)"
                     clrDropdownItem
                     (click)="openChangePwdModal()"
diff --git a/src/portal/src/app/shared/entities/shared.const.ts b/src/portal/src/app/shared/entities/shared.const.ts
index bd0e1049f95..653600580bb 100644
--- a/src/portal/src/app/shared/entities/shared.const.ts
+++ b/src/portal/src/app/shared/entities/shared.const.ts
@@ -242,7 +242,7 @@ export const RUNTIMES = {
 } as const;
 export const supportedRuntimes = Object.keys(RUNTIMES) as SupportedRuntime[];
 /**
- * The default cookie key used to store current used language preference.
+ * The default cookie key used to store current used container runtime preference.
  */
 export const DEFAULT_RUNTIME_LOCALSTORAGE_KEY = 'harbor-runtime';
 
diff --git a/src/portal/src/app/shared/units/shared.utils.ts b/src/portal/src/app/shared/units/shared.utils.ts
index 893c5efea14..74811c6cd3d 100644
--- a/src/portal/src/app/shared/units/shared.utils.ts
+++ b/src/portal/src/app/shared/units/shared.utils.ts
@@ -213,7 +213,7 @@ export const errorHandler = function (error: any): string {
 };
 
 /**
- * Gets the datetime rendering setting saved by the user, or the default setting if no valid saved value is found.
+ * Gets the container runtime saved by the user, or the default runtime if no valid saved value is found.
  */
 export function getContainerRuntime(): SupportedRuntime {
     const savedContainerRuntime = localStorage.getItem(