diff --git a/README.md b/README.md
index 9233a5d8f..f35dd32dc 100644
--- a/README.md
+++ b/README.md
@@ -122,4 +122,9 @@ You can visit the app in the following link:
 
 ## Further help
 
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
\ No newline at end of file
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+
+## Feature Toggles dictionary
+
+Shared file with all the Feature Toggles we create, so we can have a history of them
+[Feature Toggles dictionary](https://github.com/ioet/time-tracker-ui/wiki/Feature-Toggles-dictionary)
\ No newline at end of file
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 903587928..d366fd3d5 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
@@ -2,17 +2,17 @@
   <table class="table table-sm table-bordered table-striped">
     <thead class="thead-blue">
       <tr class="d-flex">
-        <th class="col-4">Activity ID</th>
-        <th class="col-5">Activity</th>
+        <th class="col-4 text-center">Activity ID</th>
+        <th class="col-5 text-center">Activity</th>
         <th class="col-3 text-center">Options</th>
       </tr>
     </thead>
     <app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar>
     <tbody *ngIf="(isLoading$ | async) === false">
       <tr class="d-flex" *ngFor="let activity of activities">
-        <td class="col-sm-4">{{ activity.id }}</td>
-        <td class="col-sm-5">{{ activity.name }}</td>
-        <td class="col-sm-3 text-center">
+        <td class="col-4 text-break">{{ activity.id }}</td>
+        <td class="col-5 ">{{ activity.name }}</td>
+        <td class="col-3 text-center">
           <button
             type="button"
             class="btn btn-sm btn-primary"
diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
index 9e3e74db3..ef364317d 100644
--- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
+++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html
@@ -1,58 +1,54 @@
 <div class="row mt-5">
-  <div class="col">
-    <table
-      class="table table-sm table-striped"
-      datatable
-      [dtTrigger]="dtTrigger"
-      [dtOptions]="dtOptions"
-      *ngIf="(reportDataSource$ | async) as dataSource"
-    >
-      <thead class="thead-blue">
-        <tr class="d-flex">
-          <th class="hidden-col" >ID</th>
-          <th class="col md-col">User email</th>
-          <th class="col sm-col">Date</th>
-          <th class="col x-sm-col" title="Duration (hours)">Duration (hours)</th>
-          <th class="col x-sm-col" title="Time in">Time in</th>
-          <th class="col x-sm-col" title="Time out">Time out</th>
-          <th class="col md-col">Project</th>
-          <th class="hidden-col">Project ID</th>
-          <th class="col md-col">Customer</th>
-          <th class="hidden-col">Customer ID</th>
-          <th class="col md-col">Activity</th>
-          <th class="col lg-col">Ticket</th>
-          <th class="col lg-col">Description</th>
-          <th class="col lg-col">Technologies</th>
-        </tr>
-      </thead>
-      <app-loading-bar
-        *ngIf="dataSource.isLoading"
-      ></app-loading-bar>
-      <tbody *ngIf="!dataSource.isLoading">
-        <tr
-          class="d-flex"
-          *ngFor="let entry of dataSource.data"
-        >
-          <td class="hidden-col">{{ entry.id }}</td>
-          <td class="col md-col">{{ entry.owner_email }}</td>
-          <td class="col sm-col">
-            {{ entry.start_date | date: 'MM/dd/yyyy' }}
-          </td>
-          <td class="col x-sm-col">
-            {{ entry.end_date | substractDate: entry.start_date }}
-          </td>
-          <td class="col x-sm-col">{{ entry.start_date | date: 'HH:mm' }}</td>
-          <td class="col x-sm-col">{{ entry.end_date | date: 'HH:mm' }}</td>
-          <td class="col md-col">{{ entry.project_name }}</td>
-          <td class="hidden-col">{{ entry.project_id }}</td>
-          <td class="col md-col">{{ entry.customer_name }}</td>
-          <td class="hidden-col">{{ entry.customer_id }}</td>
-          <td class="col md-col">{{ entry.activity_name }}</td>
-          <td class="col lg-col">{{ entry.uri }}</td>
-          <td class="col lg-col">{{ entry.description }}</td>
-          <td class="col lg-col">{{ entry.technologies }}</td>
-        </tr>
-      </tbody>
-    </table>
+  <div>
+    <div class="table-responsive">
+      <table
+        class="table table-sm table-striped mb-0"
+        datatable
+        [dtTrigger]="dtTrigger"
+        [dtOptions]="dtOptions"
+        *ngIf="(reportDataSource$ | async) as dataSource">
+        <thead class="thead-blue">
+          <tr class="d-flex">
+            <th class="hidden-col">ID</th>
+            <th class="col md-col">User email</th>
+            <th class="col sm-col">Date</th>
+            <th class="col x-sm-col" title="Duration (hours)">Duration (hours)</th>
+            <th class="col x-sm-col" title="Time in">Time in</th>
+            <th class="col x-sm-col" title="Time out">Time out</th>
+            <th class="col md-col">Project</th>
+            <th class="hidden-col">Project ID</th>
+            <th class="col md-col">Customer</th>
+            <th class="hidden-col">Customer ID</th>
+            <th class="col md-col">Activity</th>
+            <th class="col lg-col">Ticket</th>
+            <th class="col lg-col">Description</th>
+            <th class="col lg-col">Technologies</th>
+          </tr>
+        </thead>
+        <app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
+        <tbody *ngIf="!dataSource.isLoading">
+          <tr class="d-flex" *ngFor="let entry of dataSource.data">
+            <td class="hidden-col">{{ entry.id }}</td>
+            <td class="col md-col">{{ entry.owner_email }}</td>
+            <td class="col sm-col">
+              {{ entry.start_date | date: 'MM/dd/yyyy' }}
+            </td>
+            <td class="col x-sm-col">
+              {{ entry.end_date | substractDate: entry.start_date }}
+            </td>
+            <td class="col x-sm-col">{{ entry.start_date | date: 'HH:mm' }}</td>
+            <td class="col x-sm-col">{{ entry.end_date | date: 'HH:mm' }}</td>
+            <td class="col md-col">{{ entry.project_name }}</td>
+            <td class="hidden-col">{{ entry.project_id }}</td>
+            <td class="col md-col">{{ entry.customer_name }}</td>
+            <td class="hidden-col">{{ entry.customer_id }}</td>
+            <td class="col md-col">{{ entry.activity_name }}</td>
+            <td class="col lg-col">{{ entry.uri }}</td>
+            <td class="col lg-col">{{ entry.description }}</td>
+            <td class="col lg-col">{{ entry.technologies }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>
diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss
index 8246f2e3b..62f240a51 100644
--- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss
+++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss
@@ -26,3 +26,10 @@
 .hidden-col{
   display: none;
 }
+.table {
+  overflow-x: auto;
+}
+.row{
+  width: 100%;
+  display: grid;
+}
diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts
index bb22df58b..cacf54688 100644
--- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts
+++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts
@@ -17,7 +17,7 @@ import { getReportDataSource } from '../../../time-clock/store/entry.selectors';
 })
 export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewInit {
   dtOptions: any = {
-    scrollY: '600px',
+    scrollY: '590px',
     paging: false,
     dom: 'Bfrtip',
     buttons: [
diff --git a/src/app/modules/reports/components/time-range-form/time-range-form.component.html b/src/app/modules/reports/components/time-range-form/time-range-form.component.html
index 83a8ab8fe..7ec08598c 100644
--- a/src/app/modules/reports/components/time-range-form/time-range-form.component.html
+++ b/src/app/modules/reports/components/time-range-form/time-range-form.component.html
@@ -1,5 +1,4 @@
 <form [formGroup]="reportForm" (ngSubmit)="onSubmit()">
-
   <div class="form-group row">
     <label class="col-12 col-md-2 col-form-label my-1">Start date:</label>
     <div class="col-12 col-sm-6 col-md-3 my-1">
diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts
index 3c2ef721f..d21f64303 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.ts
+++ b/src/app/modules/time-entries/pages/time-entries.component.ts
@@ -128,13 +128,13 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
       if (dataToUse && this.isNewEntry()) {
         const startDate = new Date(new Date().setHours(0, 0, 0, 0));
         const entry = {
-          description : dataToUse.description ? dataToUse.description : '',
-          technologies : dataToUse.technologies ? dataToUse.technologies : [],
-          uri : dataToUse.uri ? dataToUse.uri : '',
-          activity_id : dataToUse.activity_id,
-          project_id : dataToUse.project_id,
-          start_date : startDate,
-          end_date : startDate
+          description: dataToUse.description ? dataToUse.description : '',
+          technologies: dataToUse.technologies ? dataToUse.technologies : [],
+          uri: dataToUse.uri ? dataToUse.uri : '',
+          activity_id: dataToUse.activity_id,
+          project_id: dataToUse.project_id,
+          start_date: startDate,
+          end_date: startDate
         };
         this.entry = entry;
       }