diff --git a/src/app/heating-controller/heating-controller.component.ts b/src/app/heating-controller/heating-controller.component.ts
index 6123026..1bf9917 100644
--- a/src/app/heating-controller/heating-controller.component.ts
+++ b/src/app/heating-controller/heating-controller.component.ts
@@ -6,23 +6,28 @@ import {coerceNumberProperty} from '@angular/cdk/coercion'
   selector: 'heatingcontroller',
   template: `
   <div [ngStyle]="{ 'text-align': 'center', 'background-color':'lightgrey', 'border-radius':'10px', 
-  'width': '150px', 'padding':'5px', 'margin': '5px',
+  'width': '300px', 'padding':'5px', 'margin': '5px 5px 5px 0',
   'font-family': 'sans-serif' }">
-  {{label}}<br/>
-  <button mat-mini-fab color="primary" (click)="clickOff()" [ngStyle]="{'font-size':'100%'}">off</button>
-  <button mat-mini-fab color="primary" (click)="clickOn()" [ngStyle]="{'font-size':'100%'}">on</button>
-  <button mat-mini-fab color="primary" (click)="clickForceOn()" [ngStyle]="{'font-size':'100%'}">forceOn</button>
-  <br/>
-  <mat-form-field [ngStyle]="{'margin':'10px', 'width':'80%'}">
+  {{label}}
+  <p>
+  <button mat-raised-button color="primary" (click)="clickOff()" [ngStyle]="{'font-size':'100%'}">off</button>
+  <button mat-raised-button color="accent" (click)="clickOn()" [ngStyle]="{'font-size':'100%'}">on</button>
+  <button mat-raised-button color="warn" (click)="clickForceOn()" [ngStyle]="{'font-size':'100%'}">forceOn</button>
+  </p>
+  <p>
+  <mat-form-field [ngStyle]="{'margin':'10px', 'width':'40%'}">
+    <input type="checkbox" [(ngModel)]="enableCurrentTemperature">
     <input matInput type="number" placeholder="Current" [(ngModel)]="currentTemperature"
-           (click)="setCurrentTemperature()" (keyup)="setCurrentTemperature()">
+           (click)="setCurrentTemperature()" (keyup)="setCurrentTemperature()"
+           [disabled]="! enableCurrentTemperature">
   </mat-form-field>
-  <mat-form-field [ngStyle]="{'margin':'10px', 'width':'80%'}">
+  <mat-form-field [ngStyle]="{'margin':'10px', 'width':'40%'}">
     <input type="checkbox" [(ngModel)]="enablePresetTemperature">
     <input matInput type="number" placeholder="Preset" [(ngModel)]="presetTemperature" 
            (click)="setPresetTemperature()" (keyup)="setPresetTemperature()"
            [disabled]="! enablePresetTemperature">
   </mat-form-field>
+  </p>
   </div>
   `
   
@@ -36,6 +41,7 @@ export class HeatingControllerComponent implements OnInit {
   feedbackTemperatureTopic : string = 'invalid'
   @Input() label : string = 'invalid'
 
+  enableCurrentTemperature : boolean = false
   currentTemperature : number = 20
   enablePresetTemperature : boolean = false
   presetTemperature : number = 20