diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index 9c17376bb..e622feb1f 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -19,3 +19,4 @@
 0.19: Alarms can not go bigger than 100.
 0.20: Use alarm for alarm functionality instead of own implementation.
 0.21: Add custom theming.
+0.22: Fix alarm and add build in function for step counting.
\ No newline at end of file
diff --git a/apps/lcars/README.md b/apps/lcars/README.md
index 65e31b3cc..6d4b18b9a 100644
--- a/apps/lcars/README.md
+++ b/apps/lcars/README.md
@@ -1,8 +1,7 @@
 # LCARS clock
 
 A simple LCARS inspired clock.
-Note: To display the steps, the wpedom app is required. To show weather data
-such as temperature, humidity or window you BangleJS must be connected
+To show weather data such as temperature, humidity or window you BangleJS must be connected
 with Gadgetbride and the weather app must be installed. To use the timer
 the "sched" app must be installed on your device.
 
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 3210d6832..07ca51fd9 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -1,10 +1,11 @@
+const TIMER_IDX = "lcars";
 const SETTINGS_FILE = "lcars.setting.json";
 const locale = require('locale');
 const storage = require('Storage')
 let settings = {
   alarm: -1,
   dataRow1: "Steps",
-  dataRow2: "Temp",
+  dataRow2: "HRM",
   dataRow3: "Battery",
   speed: "kph",
   fullscreen: false,
@@ -35,7 +36,7 @@ let lcarsViewPos = 0;
 var plotMonth = false;
 
 
-function convert24to16(input) 
+function convert24to16(input)
 {
   let RGB888 = parseInt(input.replace(/^#/, ''), 16);
   let r = (RGB888 & 0xFF0000) >> 16;
@@ -171,7 +172,7 @@ Graphics.prototype.setFontAntonioLarge = function(scale) {
  */
 var drawTimeout;
 function queueDraw() {
-  
+
   // Faster updates during alarm to ensure that it is
   // shown correctly...
   var timeout = isAlarmEnabled() ? 10000 : 60000;
@@ -237,7 +238,7 @@ function _drawData(key, y, c){
     value = E.getAnalogVRef().toFixed(2) + "V";
 
   } else if(key == "HRM"){
-    value = Math.round(Bangle.getHealthStatus("day").bpm);
+    value = Math.round(Bangle.getHealthStatus("last").bpm);
 
   } else if (key == "TEMP"){
     var weather = getWeather();
@@ -290,6 +291,9 @@ function drawInfo(){
     return;
   }
 
+  // Draw Infor is called from different sources so
+  // we have to ensure that the alignment is always the same.
+  g.setFontAlign(-1, -1, 0);
   g.setFontAntonioMedium();
   g.setColor(color2);
   g.clearRect(120, 10, g.getWidth(), 75);
@@ -556,17 +560,20 @@ function draw(){
  * Step counter via widget
  */
 function getSteps() {
+  var steps = 0;
   try{
       if (WIDGETS.wpedom !== undefined) {
-          return WIDGETS.wpedom.getSteps();
+          steps = WIDGETS.wpedom.getSteps();
       } else if (WIDGETS.activepedom !== undefined) {
-          return WIDGETS.activepedom.getSteps();
+          steps = WIDGETS.activepedom.getSteps();
+      } else {
+        steps = Bangle.getHealthStatus("day").steps;
       }
   } catch(ex) {
       // In case we failed, we can only show 0 steps.
   }
 
-  return 0;
+  return steps;
 }
 
 
@@ -575,38 +582,35 @@ function getWeather(){
 
   try {
     weatherJson = storage.readJSON('weather.json');
+    var weather = weatherJson.weather;
+
+    // Temperature
+    weather.temp = locale.temp(weather.temp-273.15);
+
+    // Humidity
+    weather.hum = weather.hum + "%";
+
+    // Wind
+    const wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
+    var speedFactor = settings.speed == "kph" ? 1.0 : 1.0 / 1.60934;
+    weather.wind = Math.round(wind[1] * speedFactor);
+
+    return weather
+
   } catch(ex) {
     // Return default
   }
 
-  if(weatherJson === undefined){
-    return {
-      temp: "-",
-      hum: "-",
-      txt: "-",
-      wind: "-",
-      wdir: "-",
-      wrose: "-"
-    };
-  }
-
-  var weather = weatherJson.weather;
-
-  // Temperature
-  weather.temp = locale.temp(weather.temp-273.15);
-
-  // Humidity
-  weather.hum = weather.hum + "%";
-
-  // Wind
-  const wind = locale.speed(weather.wind).match(/^(\D*\d*)(.*)$/);
-  var speedFactor = settings.speed == "kph" ? 1.0 : 1.0 / 1.60934;
-  weather.wind = Math.round(wind[1] * speedFactor);
-
-  return weather
+  return {
+    temp: " ? ",
+    hum: " ? ",
+    txt: " ? ",
+    wind: " ? ",
+    wdir: " ? ",
+    wrose: " ? "
+  };
 }
 
-
 /*
  * Handle alarm
  */
@@ -639,7 +643,7 @@ function increaseAlarm(){
       var minutes = isAlarmEnabled() ? getAlarmMinutes() : 0;
       var alarm = require('sched')
       alarm.setAlarm(TIMER_IDX, {
-      timer : (minutes+5)*60*1000,
+        timer : (minutes+5)*60*1000,
       });
       alarm.reload();
   } catch(ex){ }
@@ -654,9 +658,9 @@ function decreaseAlarm(){
       alarm.setAlarm(TIMER_IDX, undefined);
 
       if(minutes > 0){
-      alarm.setAlarm(TIMER_IDX, {
-          timer : minutes*60*1000,
-      });
+        alarm.setAlarm(TIMER_IDX, {
+            timer : minutes*60*1000,
+        });
       }
 
       alarm.reload();
diff --git a/apps/lcars/lcars.settings.js b/apps/lcars/lcars.settings.js
index 2656a54ab..b64feb30e 100644
--- a/apps/lcars/lcars.settings.js
+++ b/apps/lcars/lcars.settings.js
@@ -5,9 +5,9 @@
   const storage = require('Storage')
   let settings = {
     alarm: -1,
-    dataRow1: "Battery",
-    dataRow2: "Steps",
-    dataRow3: "Temp",
+    dataRow1: "Steps",
+    dataRow2: "HRM",
+    dataRow3: "Battery",
     speed: "kph",
     fullscreen: false,
     themeColor1BG: "#FF9900",
@@ -23,7 +23,7 @@
     storage.write(SETTINGS_FILE, settings)
   }
 
-  
+
   var dataOptions = ["Steps", "Battery", "VREF", "HRM", "Temp", "Humidity", "Wind", "Altitude", "CoreT"];
   var speedOptions = ["kph", "mph"];
   var color_options = ['Green','Orange','Cyan','Purple','Red','Blue','Yellow','White'];
diff --git a/apps/lcars/metadata.json b/apps/lcars/metadata.json
index 5f3eaa971..40da1b37f 100644
--- a/apps/lcars/metadata.json
+++ b/apps/lcars/metadata.json
@@ -3,7 +3,7 @@
   "name": "LCARS Clock",
   "shortName":"LCARS",
   "icon": "lcars.png",
-  "version":"0.21",
+  "version":"0.22",
   "readme": "README.md",
   "supports": ["BANGLEJS2"],
   "description": "Library Computer Access Retrieval System (LCARS) clock.",