diff --git a/src/app/app.ino b/src/app/app.ino
index 041d2da..1b1da05 100644
--- a/src/app/app.ino
+++ b/src/app/app.ino
@@ -1,9 +1,11 @@
 /**
- * Author : Anatole SCHRAMM-HENRY
- * Created on : 24/02/2019
- * Licence : MIT
+ * @file app.ino
+ * @author Anatole SCHRAMM-HENRY
+ * @brief SAB App entry point.
+ * @date 24/02/2019
+ * 
+ * @copyright MIT
  * 
- * SAB App entry point.
  */
 #include "definition.h" 
 #include "SAB.h"
@@ -95,7 +97,7 @@ void setup()
   sab.getIoManager().setISROnIOChange(&(ioISR), GPIO_3_RX);
 
   sab.getTaskSchedulerManager().addTask((uint16_t)0, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()->setMillis(5000), &(task_blink), &sab);
-  sab.getTaskSchedulerManager().addTask(1, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()->setSeconds(10), &(task_batt_sensing), &v1p);
+  sab.getTaskSchedulerManager().addTask(1, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()->setSeconds(10), &(task_sys_info), &v1p);
   //dataLogger.client.keepAlive(true);
   //sab.getTaskSchedulerManager().addTask(2, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()->setSeconds(1)->setTriggerRightAway(false), &(task_post_data_logger), &dataLogger);
 
@@ -131,16 +133,26 @@ void loop()
   switch(evt)
   {
     case EventHandler::Event::FLASH_BUTTON_PRESS:
-      sab.getScreenManager().displayNextView();
-      #ifdef DEBUG
-      Serial.printf("Changing view\nSelected view is : %d\n",sab.getScreenManager().getCurrentViewUID());
-      #endif
+      if(sab.getScreenManager().getEnabled())
+      {
+        sab.getScreenManager().displayNextView();
+        #ifdef DEBUG
+        Serial.printf("Changing view\nSelected view is : %d\n",sab.getScreenManager().getCurrentViewUID());
+        #endif
+      }
+      else
+        sab.getScreenManager().wakeUp();
       break;
     case EventHandler::Event::FLASH_BUTTON_LONG_PRESS:
-      sab.getScreenManager().displayPreviousView();
-      #ifdef DEBUG
-      Serial.printf("Changing view\nSelected view is : %d\n",sab.getScreenManager().getCurrentViewUID());
-      #endif
+      if(sab.getScreenManager().getEnabled())
+      {
+        sab.getScreenManager().displayPreviousView();
+        #ifdef DEBUG
+        Serial.printf("Changing view\nSelected view is : %d\n",sab.getScreenManager().getCurrentViewUID());
+        #endif
+      }
+      else
+        sab.getScreenManager().wakeUp();
       break;
     default: //NO_EVENT
       break;