diff --git a/src/portal/lib/src/helm-chart/helm-chart.component.scss b/src/portal/lib/src/helm-chart/helm-chart.component.scss
index 80a7590f9..5a321df9c 100644
--- a/src/portal/lib/src/helm-chart/helm-chart.component.scss
+++ b/src/portal/lib/src/helm-chart/helm-chart.component.scss
@@ -31,7 +31,7 @@ $size60:60px;
 }
 
 .card-container {
-    margin-top: 21px;
+    margin-top: 40px;
     .chart-card {
         width: 200px;
         margin: 10px;
diff --git a/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.html b/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.html
index 929cdc64e..806c962a3 100644
--- a/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.html
+++ b/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.html
@@ -144,7 +144,7 @@
                         <button type="button" class="btn btn-link"
                         (click)="versionDownload($event, item)">{{'HELM_CHART.DOWNLOAD' | translate}}</button>
                         <button type="button" class="btn btn-link"
-                        [disabled]="selectedRows.length<=0 || !hasDeleteHelmChartVersionPermission"
+                        [disabled]="!hasDeleteHelmChartVersionPermission"
                         (click)="deleteVersionCard($event, item)">{{'BUTTON.DELETE' | translate}}</button>
                     </clr-dropdown>
                 </div>
diff --git a/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.scss b/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.scss
index 2459e977b..9e7c9e7b3 100644
--- a/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.scss
+++ b/src/portal/lib/src/helm-chart/versions/helm-chart-version.component.scss
@@ -48,7 +48,7 @@ hbr-resource-label-signpost {
 }
 
 .card-container {
-    margin-top: 21px;
+    margin-top: 40px;
     .card-header {
         .card-media-block {
             img {
diff --git a/src/portal/lib/src/log/recent-log.component.ts b/src/portal/lib/src/log/recent-log.component.ts
index fff74dcc7..db459edcb 100644
--- a/src/portal/lib/src/log/recent-log.component.ts
+++ b/src/portal/lib/src/log/recent-log.component.ts
@@ -110,6 +110,9 @@ export class RecentLogComponent implements OnInit {
     }
 
     load(state: State) {
+        if (!state || !state.page) {
+            return;
+        }
         // Keep it for future filter
         this.currentState = state;
 
@@ -155,7 +158,6 @@ export class RecentLogComponent implements OnInit {
             this.recentLogs = doSorting<AccessLogItem>(this.recentLogs, state);
         }
     }
-
     isMatched(terms: string, log: AccessLogItem): boolean {
         let reg = new RegExp('.*' + terms + '.*', 'i');
         return reg.test(log.username) ||
diff --git a/src/portal/lib/src/repository-gridview/repository-gridview.component.ts b/src/portal/lib/src/repository-gridview/repository-gridview.component.ts
index 244619b9d..e17392619 100644
--- a/src/portal/lib/src/repository-gridview/repository-gridview.component.ts
+++ b/src/portal/lib/src/repository-gridview/repository-gridview.component.ts
@@ -222,7 +222,7 @@ export class RepositoryGridviewComponent implements OnChanges, OnInit {
         this.lastFilteredRepoName = repoName;
         this.currentPage = 1;
         let st: State = this.currentState;
-        if (!st) {
+        if (!st || !st.page) {
             st = { page: {} };
         }
         st.page.size = this.pageSize;