diff --git a/android/FarmAlarm/app/src/main/AndroidManifest.xml b/android/FarmAlarm/app/src/main/AndroidManifest.xml
index 5ebd91d..fbf0261 100644
--- a/android/FarmAlarm/app/src/main/AndroidManifest.xml
+++ b/android/FarmAlarm/app/src/main/AndroidManifest.xml
@@ -4,7 +4,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:allowBackup="true"
@@ -19,40 +20,51 @@
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
-                </intent-filter>
+            </intent-filter>
             <intent-filter>
-                    <action android:name="android.intent.action.VIEW" />
-                    <category android:name="android.intent.category.DEFAULT" />
-                    <category android:name="android.intent.category.BROWSABLE" />
-                    <data android:scheme="http" />
-                    <data android:scheme="https" />
-                    <data android:host="agrar.zoblak.com" />
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="agrar.zoblak.com" />
             </intent-filter>
         </activity>
 
         <service
             android:name=".AlarmPollingService"
             android:exported="false" />
-
         <service
             android:name=".SoundPlayingService"
             android:exported="false" />
 
         <receiver
-            android:name="PeriodicalPingReceiver"
+            android:name=".PeriodicalPingReceiver"
             android:enabled="true"
             android:exported="true" />
 
         <activity
-            android:screenOrientation="portrait"
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName=".MainScreen">
+            android:parentActivityName=".MainScreen"
+            android:screenOrientation="portrait">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.zoblak.farmalarm.MainScreen" />
         </activity>
+
+        <receiver
+            android:name=".BootBroadcastReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/BootBroadcastReceiver.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/BootBroadcastReceiver.java
new file mode 100644
index 0000000..a885ae1
--- /dev/null
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/BootBroadcastReceiver.java
@@ -0,0 +1,15 @@
+package com.zoblak.farmalarm;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class BootBroadcastReceiver extends BroadcastReceiver {
+    public BootBroadcastReceiver() {
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        MainScreen.setupAlarmManager(context);
+    }
+}
diff --git a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreen.java b/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreen.java
index 5bbef2b..ffe482b 100644
--- a/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreen.java
+++ b/android/FarmAlarm/app/src/main/java/com/zoblak/farmalarm/MainScreen.java
@@ -20,8 +20,7 @@ import java.lang.System;
 
 public class MainScreen extends AppCompatActivity {
 
-    private AlarmManager alarmMgr;
-    private PendingIntent alarmIntent;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,24 +28,25 @@ public class MainScreen extends AppCompatActivity {
         setContentView(R.layout.activity_main_screen);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
-
-        Intent intent = new Intent(this, PeriodicalPingReceiver.class);
-
-        alarmIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+        setupAlarmManager(this);
 
 
-        int PERIOD_IN_MS = 5 * 60 * 1000; // 5 minutes
 
-        alarmMgr = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
+    }
+
+    public static void setupAlarmManager(Context context) {
+        AlarmManager alarmMgr;
+
+        PendingIntent alarmIntent;
+
+        Intent intent = new Intent(context, PeriodicalPingReceiver.class);
+
+        alarmIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
+
+
+        int PERIOD_IN_MS = 2 * 60 * 1000; // 2 minutes
+
+        alarmMgr = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
         // Hopefully your alarm will have a lower frequency than this!
         alarmMgr.setRepeating(AlarmManager.RTC_WAKEUP,
                 System.currentTimeMillis(),
diff --git a/android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml b/android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml
index cb8bf87..3f2f659 100644
--- a/android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml
+++ b/android/FarmAlarm/app/src/main/res/layout/activity_main_screen.xml
@@ -23,12 +23,4 @@
 
     <include layout="@layout/content_main_screen" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
-
 </android.support.design.widget.CoordinatorLayout>
diff --git a/android/FarmAlarm/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/FarmAlarm/app/src/main/res/mipmap-hdpi/ic_launcher.png
index cde69bc..510ad38 100644
Binary files a/android/FarmAlarm/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/FarmAlarm/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/FarmAlarm/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/FarmAlarm/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c133a0c..f74957e 100644
Binary files a/android/FarmAlarm/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/FarmAlarm/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/FarmAlarm/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/FarmAlarm/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index bfa42f0..fe951ea 100644
Binary files a/android/FarmAlarm/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/FarmAlarm/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/FarmAlarm/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/FarmAlarm/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 324e72c..6b8f99c 100644
Binary files a/android/FarmAlarm/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/FarmAlarm/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/FarmAlarm/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/FarmAlarm/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index aee44e1..9e38392 100644
Binary files a/android/FarmAlarm/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/FarmAlarm/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/client/alarm.html b/app/client/alarm.html
index 8eef62a..30bc9c3 100644
--- a/app/client/alarm.html
+++ b/app/client/alarm.html
@@ -1,7 +1,6 @@
 <template name="alarm">
 
   <div class="hello">
-    <h1> Temperatura </h1>
     <div class="jumbotron text-center center-block" >
       {{#with state}}
         {{#if alarmTriggered}}
diff --git a/app/client/app.less b/app/client/app.less
index 33c7b39..ce0ae1d 100644
--- a/app/client/app.less
+++ b/app/client/app.less
@@ -11,7 +11,7 @@
 }
 
 .huge_text {
-  font-size: 3em;
+  font-size: 2.5em;
 }
 
 @media all and (orientation: portrait) {
@@ -32,14 +32,14 @@
 
 @media all and (orientation: portrait) {
   #alarm_image {
-    width: 90%;
+    width: 70%;
     cursor: pointer;
   }
 }
 
 @media all and (orientation: landscape) {
   #alarm_image {
-    width: 40%;
+    width: 30%;
     cursor: pointer;
   }
 }
diff --git a/app/server/api.js b/app/server/api.js
index 17fcc7e..beda432 100644
--- a/app/server/api.js
+++ b/app/server/api.js
@@ -28,6 +28,7 @@ Api.addRoute('sensorData', {
       created_at: new Date()
     };
     SensorData.insert(sensorObject);
+    reactToAlarmData(this.bodyParams.controllerId);
     return [];
   }
 });
diff --git a/app/server/methods.js b/app/server/methods.js
index d5a3914..d601952 100644
--- a/app/server/methods.js
+++ b/app/server/methods.js
@@ -149,8 +149,8 @@ function saveAlarmSettings(controller_id, minTemperature, maxTemperature, timeou
     '$set': {
       'config.minTemperature': parseFloat(minTemperature),
       'config.maxTemperature': parseFloat(maxTemperature),
-      'config.timeoutBox': parseInt(timeoutBox),
-      'config.timeoutPhone': parseInt(timeoutPhone),
+      'config.timeoutBox': timeoutBox ? parseInt(timeoutBox) : null,
+      'config.timeoutPhone': timeoutPhone ? parseInt(timeoutPhone) : null,
       'config.smsNumbers': smsNumbers,
       'config.sms1': smsNumbers[0],
       'config.sms2': smsNumbers[1],
@@ -164,7 +164,7 @@ function saveAlarmSettings(controller_id, minTemperature, maxTemperature, timeou
   SyncedCron.add({
     name: jobName,
     schedule: function(parser) {
-      return parser.text('every 30 seconds');
+      return parser.text('every 10 seconds');
     },
     job: function() {
       reactToAlarmData(controller_id);
@@ -252,7 +252,7 @@ function soundTheAlarm(controller_id, tooCold, tooHot, boxSilent, phoneSilent) {
   };
 
   var smsSent = !!state.state.alarmSmsSent;
-  var needsToSendSms = !smsSent; // && (boxSilent || phoneSilent);
+  var needsToSendSms = !smsSent && phoneSilent;
 
   var sendSmsPart = needsToSendSms ? { 'state.alarmSmsSent': true } : {};