diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.html
index eeb089572..fca28c4f8 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.html
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.html
@@ -1,31 +1,28 @@
 <div nz-row>
   <div nz-col nzMd="3"></div>
   <div nz-col nzMd="18">
-    <nz-card  [nzExtra]="extraWorkTemplate" [nzTitle]="title">
+    <nz-card [nzExtra]="extraWorkTemplate" [nzTitle]="title">
       <ng-template #title>
-      <div class="el_content">
-        <div class="el-img">
-          <img
-            src="data:image/png;base64,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"
-            class="el-image__inner"
-          />
+        <div class="el_content">
+          <div class="el-img">
+            <img
+              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAPKADAAQAAAABAAAAPAAAAACL3+lcAAAIdklEQVRoBe1baXAURRT+drmC3AGDRLlvIioGIqAoWp7lWWqVF95X+cNCy1L/WZb/VdQfWh4lKl7ljbeiloqAEEDQAIJCkFOEEJQrQLJ+33bancz0ZmavRINdtTsz3T3d7+t+/d7r93piaEyJRCKGxypuQaLhZmaVIYGutuw/eY1hN+muQiz+HKYvfDYWiyWEI6a/xKPl/XiZRZBn6LnNpRi+JKZpsbsXb4knZ7Ytg9XsmYmcJayxxIwJt6Kh4ek2N6suQPH4bfHGNesqbnt5lE9xoipre8jSIirjDP/HpXFabI4CYm3vyC5MVpxdHT0OGHUu0PMYCRLgz83Ayo+BzUuB+oOF6dfXassALj0BqLgROIqrp3NPDwnlwJBTgd9XAItmAhuXsCypLj118ntbWMC9hwITrgf6TwC6HummvHMPYNAkoM8wAl5M4C8A29e46+YhN5Z4pDz/Q9rtKOCEK4Bhpxv2zYTQ2k3A2q+Bpa+S5bdk8makuvkFXMTZKrsQGMNf78G046QEfGlvDVCzDmhfBHQvBY7o5avAxwTnoGYtsOIj4Kf3gP21wTpZ5uQHcLtOwHBapeOuBI4cDrTrGCSnbo9Zq5UvAuvnm/L+FYbltbY7OUx3CbI/VgPL3gBWzwEO7Q+2m2FOboA1gwNOAsZfR4E0BujYJdh9/QESzTW59DVgDU3a+rqmdTQ4Q6cCJ17FwRrJmXcM1oG9HKyVQHKwFpAD6pu2kcFT9oD7jubs3GhUjZMtG4AdZMuq982v7s/mydIMaymUXcTlMASItwvW37uTKmyZkehbfwqWR8jJHHAP6tDyacDgk7kGtclypNqNwC9fAT+8Dvy11VGhmayuJY0Cj0ukV393RbVZzWWx+GVgZ7W7Tprc6IBlOGiNHnsJUDzI3dzubcBviwzr7fjVXSdqbjGFnpaKlkw3DoIr1VQb7ql8wVXqzIsIOAZc9DD16Xiu0yOCDe3fBWwhiy18niz3Q7A8l5x+xxmjRVfpbH86RJmwoRKYfQ/QcMhfGniOBlg6dfIdQUl6YB+NBErRypeAdXMjdRigIEqGuEvGyfjrgRIKtg6dm74lDbDgaWAJWTwkUcyGJOlL2b8utdFOgoVNSGomKKQKlRrYvn4xclrMIcw6UTuMPJsD4eA+H00cupDUawDQJY1ZKJVSOhY46wGu3YXA98/QYKgOaTDD4l4DgZNuBgZOpJFSnP5lCTvJFtnlzaRwwLKe9LPpEPWqVIZXbUgtjToH6DuKQuQDYPmbQN1f9o3sruKosZcZy01A/Ck56+Sq9h1MSZLO7v5agedwlhawJOs2visgy98Gdm0ONAbNxqRbgUtmcBc0xW1aBt/y5ZBtB00GLmYbk253awTZ2D++09TkFJ0udve1Hj7DvheSjys4iytmk9UI7phxXN/dUrWSbH68h82fNbZzqkb6uzD2rdtttMB8CijJjKGnpW8rTUl2gNWYTL0P76cNfSbNwqtpFo5ws3kJ2Xzlh8YeTsfmUdg3aZ6+Spv6M+MsULtZpOwBqzMZ96s+psD6nqCvAUacBfQobUpGMdl84i3GMls0k+rrO49EF/tS3VTcxPU/xm1Hi31Xf0GVMwvYs71p21k85QbYdqgt39wnSNjnBHdbNDYXSzYnfb3sGyJ5LRlRrvkBbHvatio6m4OAZT76k6Svn339dXJ4zi9gERKVzV1E55l9XV3kH7Dtxc/m8lgWeaS5radrgdjX24W9Lxxg24PY/IP7jECTNJctbF0/Wsdi3yWvpKSvfa9A13DDIx8daxcjaf7tY5xNGvo2HdxnhJ3UVgv5pVsGsAVYr+1bwj6ZawsBtZ22LGDbayte/wfcioPfIl3/P8Ohw2xVSmjFf2eF8BmWt/8gHWU2yZ1Syu1fayftljrSSWCT6JRDLySFA95PB/q+nalmtN8tu4C7nJMjbbhTL+bpThw2kDusidyLd/Q48+SkD3P2k4RwS0vRg53r6RQfkKJYe99zHsw5CpBqMOKdtpATbnBHO2o3GKstpKlwwGpAMR3Fb72RBvmxhk01fqzqBYwCzMo4ChBCW6q4Z39GO641e2cvDbaGrDfFlf1GjS33XKMB3rQUmPcUMOVOejD7eF7nrWLBYxmN0OZgzRzj2cjDRj3ZifqSI28kHQsuR54qaYf1zeMMplcmXwn7iwZYrcjeVfhEG/zS43xHF1guz4bYbfAUxnTfZf2PgAP0QWWTFIWUL3zspYazvB5S256Ndsx7EtAGJWKKDlgNquH37yWoyYbFSkY3FRwirITre8p047ZdQh+UovlR7WVFGDRg5XQXSQp3KArC0IZj289mCWUR7cgMsLpXlGHttyaeM+Js4PjLOQvD6cr1NNWhk1FdxUOArRdTBnB9bVgcJN6boyWh8Gu/Y7lv7u4tMff17HcHt5JyEa/6hKpyb7BOhBwPlRFqe6topKveMzMo1ht1nllnCofYpA1/8sAKB2QTActJ70+KE537UPMHX2qqCfJT+qLfAuRYyCFFC6ZF6aDH0cZzOfiUoOfSvi8BU9QztQxkKOzZkb6+nP3V8wz77tpoW8npmj/AlgwdW6i4gVL7REr03jY3s6tmUZph0Uzj/87s7WZr5x9wsjuytc5m6YxWugMrLrKSB1+qjN5XcK4AEcns17CL4H/y6NXYQIIVHB86tfkDK3pHB1+2rTZHJFwHX/5pN/ebAs2wj7DkgRXa36PPp4lKfW1PESigXrvenLesmp17xNHXreuxZQDbnhXS1NEFHS4F2V7275bljALusjUKfi0QS6ehW8DWUYe3YopzoLO0/1qR6my7JlZuLvmpy+GTqjjD/K7ncEnEGkt+xjNj/BxuJc9o07j17dJdlWfGG7/Ymsa1/GWbBWw/1OJXS9QNJh0un+L9DX1xpm7tIQNGAAAAAElFTkSuQmCC"
+              class="el-image__inner" />
+          </div>
+          <div class="el-title">{{ 'mxk.menu.applist' | i18n }}</div>
         </div>
-        <div class="el-title">{{ 'mxk.menu.applist' | i18n }}</div>
-      </div>
       </ng-template>
 
       <ng-template #extraWorkTemplate>
-        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="Please select Category" style="min-width: 180px" [(ngModel)]="appsCategory" (ngModelChange)="changeCategory()">
-          <nz-option nzLabel="All" nzValue=""></nz-option>
-          <nz-option *ngFor="let item of appCategoryList; let i = index"  [nzLabel]="item.name" [nzValue]="item.id" ></nz-option>
+        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="Please select Category" style="min-width: 180px"
+          [(ngModel)]="appsCategory" (ngModelChange)="changeCategory(appsCategory)">
+          <nz-option nzLabel="All" nzValue="All"></nz-option>
+          <nz-option *ngFor="let item of appCategoryList; let i = index" [nzLabel]="item.name"
+            [nzValue]="item.id"></nz-option>
         </nz-select>
       </ng-template>
-      <nz-list
-        [nzLoading]="loading"
-        [nzDataSource]="appList"
-        [nzRenderItem]="item"
-        [nzGrid]="{ gutter: 24, xl: 6, lg: 8, md: 8, sm: 12, xs: 24 }"
-      >
+      <nz-list [nzLoading]="loading" [nzDataSource]="appList" [nzRenderItem]="item"
+        [nzGrid]="{ gutter: 24, xl: 6, lg: 8, md: 8, sm: 12, xs: 24 }">
         <ng-template #item let-item>
           <nz-list-item>
             <nz-card nzHoverable style="">
@@ -72,4 +69,4 @@
     </nz-card>
   </div>
   <div nz-col nzMd="3"></div>
-</div>
+</div>
\ No newline at end of file
diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.ts
index 57c3c67e3..ba2abd4de 100644
--- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.ts
+++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/dashboard/home/home.component.ts
@@ -118,12 +118,15 @@ export class HomeComponent implements OnInit {
     });
   }
 
-  changeCategory(): void {
-    if (this.appCategoryService.list() === null || this.appCategoryService.list() === '') {
+  changeCategory(category: String): void {
+    //console.log(category);
+    if (this.appCategoryService.list() === null || this.appCategoryService.list() === '' || category === 'All') {
       this.appList = this.staticAppList;
     } else {
+      this.appList = [];
       for (let i = 0; i < this.staticAppList.length; i++) {
-        if (this.staticAppList[i].category === this.appCategoryService.list()) {
+        //console.log(this.staticAppList[i]);
+        if (this.staticAppList[i].category === this.appsCategory) {
           this.appList.push(this.staticAppList[i]);
         }
       }