diff --git a/src/app/modules/activities-management/components/activity-list/activity-list.component.html b/src/app/modules/activities-management/components/activity-list/activity-list.component.html
index f5d54c421..22ebd1fc8 100644
--- a/src/app/modules/activities-management/components/activity-list/activity-list.component.html
+++ b/src/app/modules/activities-management/components/activity-list/activity-list.component.html
@@ -1,31 +1,21 @@
-<div class="card-body pt-0 mt-4">
-  <div class="scroll">
-    <div class="accordion" id="accordionActivities">
-      <div *ngIf="activities?.length > 0; else notShow">
-        <div class="card" *ngFor="let activity of activities; let rowIndex = index">
-          <div class="card-header style-list-project">
-            <h2 class="mb-0">
-              <a type="button" data-toggle="collapse" [attr.data-target]="'#row' + rowIndex">
-                {{ activity.name }}
-              </a>
-              <div class="btn-group float-right" role="group">
-                <i class="far fa-edit btn btn-link text-white" (click)="updateActivity(activity.id)"></i>
-                <i (click)="deleteActivity(activity.id)" class="far fa-trash-alt btn btn-link text-white"></i>
-              </div>
-            </h2>
-          </div>
-
-          <div [id]="'row' + rowIndex" class="collapse" data-parent="#accordionActivities">
-            <div class="card-body">
-              <h5>Description:</h5>
-              <p>{{ activity.description }}</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <ng-template #notShow>
-        <app-empty-state></app-empty-state>
-      </ng-template>
-    </div>
-  </div>
+<div class="activity-list">
+  <table class="table table-sm table-bordered table-striped">
+    <thead class="thead-orange">
+      <tr class="d-flex">
+        <th class="col-9">Activity</th>
+        <th class="col-3 text-center"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr class="d-flex" *ngFor="let activity of activities">
+        <td class="col-sm-9">{{ activity.name }}</td>
+        <td class="col-sm-3 text-center">
+          <button type="button" class="btn btn-sm btn-primary" (click)="updateActivity(activity.id)"><i
+              class="fa fa-pencil fa-xs"></i></button>
+          <button type="button" class="btn btn-sm btn-danger ml-2" (click)="deleteActivity(activity.id)"><i
+              class="fas fa-trash-alt fa-xs"></i></button>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
diff --git a/src/app/modules/activities-management/components/activity-list/activity-list.component.scss b/src/app/modules/activities-management/components/activity-list/activity-list.component.scss
index bad7c99f9..d42df4936 100644
--- a/src/app/modules/activities-management/components/activity-list/activity-list.component.scss
+++ b/src/app/modules/activities-management/components/activity-list/activity-list.component.scss
@@ -1,11 +1,5 @@
 @import '../../../../../styles/colors.scss';
 
-.style-list-project {
-  background-color: $primary;
-  color: white;
-}
-
-.scroll {
-  max-height: 400px;
-  overflow-y: auto;
+.activity-list {
+  max-height: 400px; overflow: auto; display:inline-block; width: 60%;
 }
diff --git a/src/app/modules/activities-management/components/create-activity/create-activity.component.html b/src/app/modules/activities-management/components/create-activity/create-activity.component.html
index 8f385810b..aee583003 100644
--- a/src/app/modules/activities-management/components/create-activity/create-activity.component.html
+++ b/src/app/modules/activities-management/components/create-activity/create-activity.component.html
@@ -1,35 +1,31 @@
-<div class="card mt-4">
-  <form class="card-body" [formGroup]="activityForm" (ngSubmit)="onSubmit(activityForm.value)">
-    <h1 class="card-title">Activity</h1>
-    <div class="form-group">
-      <label for="name">Name:</label>
-      <input
-        class="form-control"
-        id="name"
-        type="text"
-        formControlName="name"
-        [class.is-invalid]="name.invalid && name.touched"
-        required
-      />
+<h4>Activities</h4>
+<hr/>
+<div style="width: 60%;">
+
+  <form [formGroup]="activityForm" (ngSubmit)="onSubmit(activityForm.value)">
+    <div class="input-group input-group-sm mb-3">
+      <div class="input-group-prepend">
+        <span class="input-group-text span-width">Name</span>
+      </div>
+      <input class="form-control" id="name" type="text" formControlName="name"
+        [class.is-invalid]="name.invalid && name.touched" required />
       <div class="text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
         Activity name is required.
       </div>
     </div>
 
-    <div class="form-group">
-      <label for="details">Description:</label>
-      <textarea class="form-control" rows="3" id="description" type="text" formControlName="description"></textarea>
+    <div class="input-group input-group-sm mb-3">
+      <div class="input-group-prepend">
+        <span class="input-group-text span-width">Description</span>
+      </div>
+      <textarea class="form-control" rows="2" id="description" type="text" formControlName="description"></textarea>
     </div>
 
-    <div class="btn-toolbar" role="toolbar">
-      <div class="btn-group mr-2" role="group">
-        <button class="btn btn-primary mb-2" type="submit" [disabled]="!activityForm.valid">Save</button>
-      </div>
-      <div class="btn-group mr-2" role="group">
-        <button class="btn btn-secondary mb-2" type="reset" [hidden]="!activityToEdit" (click)="cancelButton()">
-          Cancel
-        </button>
-      </div>
+    <div class="form-group" style="text-align: right;">
+      <button class="btn btn-primary" type="submit" [disabled]="!activityForm.valid">Save</button>
+      <button class="btn btn-secondary mb-2 ml-2 mt-2" type="reset" [hidden]="!activityToEdit" (click)="cancelButton()">
+        Cancel
+      </button>
     </div>
   </form>
 </div>
diff --git a/src/app/modules/activities-management/components/create-activity/create-activity.component.scss b/src/app/modules/activities-management/components/create-activity/create-activity.component.scss
index 2d8850f33..dc47b027b 100644
--- a/src/app/modules/activities-management/components/create-activity/create-activity.component.scss
+++ b/src/app/modules/activities-management/components/create-activity/create-activity.component.scss
@@ -1 +1,11 @@
 @import '../../../../../styles/colors.scss';
+
+.span-width {
+  width: 6rem;
+  background-color: $primary;
+  color: white;
+}
+
+.hidden {
+  display: none;
+}
diff --git a/src/app/modules/activities-management/pages/activities-management.component.html b/src/app/modules/activities-management/pages/activities-management.component.html
index cbcf2ec88..d165c5f48 100644
--- a/src/app/modules/activities-management/pages/activities-management.component.html
+++ b/src/app/modules/activities-management/pages/activities-management.component.html
@@ -1,10 +1,4 @@
 <div class="container">
-  <div class="row">
-    <div class="col">
-      <app-create-activity></app-create-activity>
-    </div>
-    <div class="col">
-      <app-activity-list></app-activity-list>
-    </div>
-  </div>
+  <app-create-activity></app-create-activity>
+  <app-activity-list></app-activity-list>
 </div>
diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html
index a98b39fa7..e39248571 100644
--- a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html
+++ b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html
@@ -19,14 +19,18 @@
                     [selectedTechnologies]="selectedTechnologies">
   </app-technologies>
 
-  <div class="form-group text-left">
-    <label for="NotesTextarea">Description</label>
+
+  <div class="input-group input-group-sm mb-3">
+    <div class="input-group-prepend">
+      <span class="input-group-text span-width">Description</span>
+    </div>
     <textarea
       (blur)="onSubmit()"
       formControlName="description"
       class="form-control"
       id="NotesTextarea"
-      rows="3">
+      rows="2">
     </textarea>
   </div>
+
 </form>