diff --git a/package-lock.json b/package-lock.json
index 7887e1bef..4b129830d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.47.6",
+  "version": "1.47.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e0f37da2a..85f60b509 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.47.6",
+  "version": "1.47.7",
   "scripts": {
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",
diff --git a/src/app/modules/time-entries/components/calendar/calendar.component.html b/src/app/modules/time-entries/components/calendar/calendar.component.html
index 3f8cb8593..58d4e2fea 100644
--- a/src/app/modules/time-entries/components/calendar/calendar.component.html
+++ b/src/app/modules/time-entries/components/calendar/calendar.component.html
@@ -66,14 +66,14 @@
 
 <div>
     <div class="row justify-content-between ">
-      <div class="col-xs-12 col-sm-5 col-md-5 custom-left-buttons-group">
+      <div class="col-xs-12 col-sm-4 col-md-5 custom-left-buttons-group">
         <div class="btn-group" role="group" aria-label="Move date">
           <button
             mwlCalendarPreviousView
             type="button"
             [(view)]="calendarView"
             [(viewDate)]="currentDate"
-            class="btn btn-light btn-block m-0"
+            class="btn btn-navigation btn-light btn-block m-0"
             (click)="handleChangeDateEvent()"
           >
             Previous
@@ -83,7 +83,7 @@
             [ngClass]="{ active: isToday }"
             type="button"
             [(viewDate)]="currentDate"
-            class="btn btn-light btn-block m-0"
+            class="btn btn-navigation btn-light btn-block m-0"
             (click)="handleChangeDateEvent()"
           >
             Today
@@ -93,7 +93,7 @@
             type="button"
             [(view)]="calendarView"
             [(viewDate)]="currentDate"
-            class="btn btn-light btn-block m-0"
+            class="btn btn-navigation btn-light btn-block m-0"
             (click)="handleChangeDateEvent()"
             [disabled]="nextDateDisabled"
           >
@@ -102,7 +102,7 @@
         </div>
       </div>
       <div class="col-xs-12 col-sm-2 col-md-2 text-center currentDate">
-        <p class="font-weight-bold h4">
+        <p class="font-weight-bold h5">
           {{ currentDate | date: 'EEEE' }}
         </p>
         <P class="h5">
@@ -114,7 +114,7 @@
           <button
             [ngClass]="{ active: isVisibleForCurrentView(calendarView, [CALENDAR_VIEW_ENUM.Month]) }"
             type="button"
-            class="btn btn-light btn-block m-0"
+            class="btn btn-navigation btn-light btn-block m-0"
             (click)="changeCalendarView(CALENDAR_VIEW_ENUM.Month)"
           >
             Month
@@ -122,7 +122,7 @@
           <button
             [ngClass]="{ active: isVisibleForCurrentView(calendarView, [CALENDAR_VIEW_ENUM.Week]) }"
             type="button"
-            class="btn btn-light btn-block m-0"
+            class="btn btn-navigation btn-light btn-block m-0"
             (click)="changeCalendarView(CALENDAR_VIEW_ENUM.Week)"
           >
             Week
@@ -130,7 +130,7 @@
           <button
             [ngClass]="{ active: isVisibleForCurrentView(calendarView, [CALENDAR_VIEW_ENUM.Day]) }"
             type="button"
-            class="btn btn-light btn-block m-0"
+            class="btn btn-navigation btn-light btn-block m-0"
             (click)="changeCalendarView(CALENDAR_VIEW_ENUM.Day)"
           >
             Day
diff --git a/src/app/modules/time-entries/components/calendar/calendar.component.scss b/src/app/modules/time-entries/components/calendar/calendar.component.scss
index f83e9adde..61b109db5 100644
--- a/src/app/modules/time-entries/components/calendar/calendar.component.scss
+++ b/src/app/modules/time-entries/components/calendar/calendar.component.scss
@@ -133,6 +133,7 @@ $activity-text-size: $max-lines-activity * $line-height-base;
   p {
     margin: 0;
   }
+  padding-right: 0px;
 }
 
 @media (max-width: 576px) {
@@ -152,3 +153,18 @@ $activity-text-size: $max-lines-activity * $line-height-base;
     text-align: start;
   }
 }
+
+.btn-navigation{
+  padding-left: 6px;
+  padding-right: 6px;
+}
+
+@media only screen and (min-width : 576px) and (max-width : 767px) {
+  .currentDate{
+    margin-left: 14px;
+    p {
+      margin: 0;
+    }
+    padding-right: 0px;
+  }
+}
diff --git a/src/app/modules/time-entries/pages/time-entries.component.html b/src/app/modules/time-entries/pages/time-entries.component.html
index 1711ea0b8..ac2060ef3 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.html
+++ b/src/app/modules/time-entries/pages/time-entries.component.html
@@ -54,8 +54,14 @@
             <th class="col"></th>
           </tr>
         </thead>
+        <tr *ngIf="dataSource.isLoading">
+          <td class="text-center" colspan="7">{{NO_DATA_MESSAGE}}</td>
+        </tr>
         <app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
         <tbody *ngIf="!dataSource.isLoading">
+          <tr *ngIf="!dataSource?.data.length">
+            <td class="text-center" colspan="7">{{NO_DATA_MESSAGE}}</td>
+          </tr>
           <tr class="d-flex" *ngFor="let entry of dataSource.data">
             <td class="col">{{ entry.start_date | date: 'MM/dd/yyyy' }}</td>
             <td class="col">{{ entry.start_date | date: 'HH:mm' }} - {{ entry.end_date | date: 'HH:mm' }}</td>
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 7ba274bbe..07d3687ea 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.ts
+++ b/src/app/modules/time-entries/pages/time-entries.component.ts
@@ -38,6 +38,8 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
   selectedYear: number;
   selectedMonthAsText: string;
   isActiveEntryOverlapping = false;
+  readonly NO_DATA_MESSAGE: string = 'No data available in table';
+  timeEntry: DataSource<Entry>;
   constructor(
     private store: Store<EntryState>,
     private toastrService: ToastrService,