diff --git a/src/app/bottom-bar/bottom-bar.component.html b/src/app/bottom-bar/bottom-bar.component.html
index 6c1185094..fa1f9403f 100644
--- a/src/app/bottom-bar/bottom-bar.component.html
+++ b/src/app/bottom-bar/bottom-bar.component.html
@@ -3,7 +3,7 @@
         <td class="bottom-bar__printer-name"> {{ printer.name }} </td>
         <td class="bottom-bar__enclosure-temperature" *ngIf="enclosureTemperature">
             <img src="assets/thermometer.svg" class="bottom-bar__enclosure-temperature-icon" />
-            {{ enclosureTemperature.temperature }}°C
+            {{ enclosureTemperature.temperature }}{{ enclosureTemperature.unit }}
         </td>
         <td class="bottom-bar__current-status" [ngClass]="{'bottom-bar__error': printer.status.includes('error')}">
             {{ printer.status }} </td>
diff --git a/src/app/bottom-bar/bottom-bar.component.ts b/src/app/bottom-bar/bottom-bar.component.ts
index 3e6711204..a75809647 100644
--- a/src/app/bottom-bar/bottom-bar.component.ts
+++ b/src/app/bottom-bar/bottom-bar.component.ts
@@ -45,4 +45,5 @@ interface Printer {
 export interface TemperatureReading {
   temperature: number;
   humidity: number;
+  unit: string;
 }
diff --git a/src/app/files/files.component.ts b/src/app/files/files.component.ts
index 1cf04cad7..a8deb8994 100644
--- a/src/app/files/files.component.ts
+++ b/src/app/files/files.component.ts
@@ -24,6 +24,7 @@ export class FilesComponent {
     private router: Router,
     private jobService: JobService) {
     this.showLoader();
+    this.folderContent = [];
     this.currentFolder = '/';
     this.openFolder(this.currentFolder);
   }
@@ -44,7 +45,7 @@ export class FilesComponent {
   public openFolder(folderPath: string): void {
     setTimeout(() => {
       this.showLoader();
-      this.folderContent = null;
+      this.folderContent = [];
       this.filesService.getFolder(folderPath).then(
         (data) => {
           this.folderContent = data;
diff --git a/src/app/main-menu/main-menu.component.ts b/src/app/main-menu/main-menu.component.ts
index 42548b900..b3dd0e55a 100644
--- a/src/app/main-menu/main-menu.component.ts
+++ b/src/app/main-menu/main-menu.component.ts
@@ -7,7 +7,7 @@ import { Component, OnInit } from '@angular/core';
 })
 export class MainMenuComponent implements OnInit {
 
-  public settings = true;
+  public settings = false;
 
   public showSettings() {
     this.settings = true;
diff --git a/src/app/notification/notification.component.scss b/src/app/notification/notification.component.scss
index 164de7277..e6bc3f22d 100755
--- a/src/app/notification/notification.component.scss
+++ b/src/app/notification/notification.component.scss
@@ -12,8 +12,7 @@
     border-right: 1vw solid #5a6675;
 
     &__show {
-        // FIXME
-        // top: 5vh;
+        top: 5vh;
     }
 
     &__heading {
diff --git a/src/app/plugin-service/enclosure.service.ts b/src/app/plugin-service/enclosure.service.ts
index bcfc3fbb2..4d006190e 100644
--- a/src/app/plugin-service/enclosure.service.ts
+++ b/src/app/plugin-service/enclosure.service.ts
@@ -25,7 +25,8 @@ export class EnclosureService {
             (data: EnclosurePluginAPI) => {
               observer.next({
                 temperature: data.temp_sensor_temp,
-                humidity: data.temp_sensor_humidity
+                humidity: data.temp_sensor_humidity,
+                unit: data.use_fahrenheit ? '°F' : '°C'
               } as TemperatureReading);
             }, (error: HttpErrorResponse) => {
               this.notificationService.setError('Can\'t retrieve enclosure temperature!', error.message);