diff --git a/db.json b/db.json
index c4c499a..adc9d0b 100644
--- a/db.json
+++ b/db.json
@@ -1,10 +1,16 @@
 {
   "tasks": [
     {
-      "title": "Drink Coffee",
+      "title": "30 secs side plank",
       "completed": false,
       "editing": false,
-      "id": 1
+      "id": 4
+    },
+    {
+      "title": "sleep",
+      "completed": false,
+      "editing": false,
+      "id": 5
     }
   ]
 }
\ No newline at end of file
diff --git a/src/app/Todo-List-App/components/todo-empty/todo-empty.component.css b/src/app/Todo-List-App/components/todo-empty/todo-empty.component.css
index 17bd207..09ff59a 100644
--- a/src/app/Todo-List-App/components/todo-empty/todo-empty.component.css
+++ b/src/app/Todo-List-App/components/todo-empty/todo-empty.component.css
@@ -1,8 +1,9 @@
-h3{
+h5{
     font-size: 2em;
+    margin-top: 1em;
 }
 
-.img-div, h3{
+.img-div, h5{
     display: flex;
     justify-content: center;
 }
diff --git a/src/app/Todo-List-App/components/todo-empty/todo-empty.component.html b/src/app/Todo-List-App/components/todo-empty/todo-empty.component.html
index 08682d1..5ca9ede 100644
--- a/src/app/Todo-List-App/components/todo-empty/todo-empty.component.html
+++ b/src/app/Todo-List-App/components/todo-empty/todo-empty.component.html
@@ -1,6 +1,6 @@
 <div @fade>
-  <h3>All Task Accomplished 👻</h3>
-  <div class="img-div">
+  <h5>Yey! All task has been completed 👻</h5>
+  <!-- <div class="img-div">
     <img src="../../../../assets/to-do.png" alt="to-do">
-  </div>
+  </div> -->
 </div>
diff --git a/src/app/Todo-List-App/containers/TodoList/todo-list.component.css b/src/app/Todo-List-App/containers/TodoList/todo-list.component.css
index 84fda37..bd99c58 100644
--- a/src/app/Todo-List-App/containers/TodoList/todo-list.component.css
+++ b/src/app/Todo-List-App/containers/TodoList/todo-list.component.css
@@ -32,6 +32,8 @@ li > *{
     margin: 2px;
 }
 
+
+
 .main{
     max-width: 50%;
     box-shadow: 8px 6px#858181;
diff --git a/src/app/Todo-List-App/containers/TodoList/todo-list.component.html b/src/app/Todo-List-App/containers/TodoList/todo-list.component.html
index c0373dd..bf962b4 100644
--- a/src/app/Todo-List-App/containers/TodoList/todo-list.component.html
+++ b/src/app/Todo-List-App/containers/TodoList/todo-list.component.html
@@ -4,9 +4,7 @@
         <div class="header">
             <h1>TODO LIST <i class="fa fa-pencil"></i></h1>
         </div>
-        <div *ngIf="remaining() !== 0">
-            <div class="info selectall"><input type="checkbox" (change)="selectAll()">Select All</div>
-        </div>
+        <div class="info selectall"><input type="checkbox" (change)="selectAll()">Select All</div>
         <div class="inputDiv">
             <input type="text" class="form-control addInput" placeholder="Things you want to do today?" [(ngModel)]="taskTitle" (keyup.enter) = "addTask()">
         </div>
@@ -23,15 +21,15 @@
                     </ng-template>
 
                     <!-- buttons switching -->
-                    <div *ngIf="!task.editing; else doneBtn" ><button [ngClass] = "{disabled: task.completed}" class="btn btn-success listBtn"(click)="toggleEdit(task)" ><i class="fa fa-edit"> Edit</i></button></div>    
+                    <div *ngIf="!task.editing; else doneBtn" ><button [ngClass] = "{disabled: task.completed}" class="btn btn-success listBtn"(click)="toggleEdit(task)" ><i class="fa fa-edit"> </i>Edit</button></div>    
                     <ng-template #doneBtn>
                     <div>
-                        <button class="btn btn-success listBtn"(click)="editTask(task); toggleEdit(task)" ><i class="fa fa-edit">Done</i></button>
+                        <button class="btn btn-success listBtn"(click)="editTask(task); toggleEdit(task)" ><i class="fa fa-edit"></i> Done</button>
                     </div>
                     </ng-template>
                 
                     <div>
-                        <button class="btn btn-danger listBtn" (click)="deleteTask(task)"><i   class="fa fa-trash"> Del</i></button>
+                        <button class="btn btn-danger listBtn" (click)="deleteTask(task)"><i   class="fa fa-trash"> </i> Del</button>
                     </div>
                 </li>
             </ul>
diff --git a/src/app/Todo-List-App/containers/TodoList/todo-list.component.ts b/src/app/Todo-List-App/containers/TodoList/todo-list.component.ts
index ad34121..db13486 100644
--- a/src/app/Todo-List-App/containers/TodoList/todo-list.component.ts
+++ b/src/app/Todo-List-App/containers/TodoList/todo-list.component.ts
@@ -26,7 +26,7 @@ export class TodoList{
     taskId: number;
     taskTitle: string;
     editing: boolean = false;
-    tasks:Tasks[];
+    tasks:Tasks[] = [];
     beforeEditing: string;
     today: number = Date.now();