diff --git a/src/layersurface.c b/src/layersurface.c
index 12d855885b3235cb79f1a6b4feda63965758e0da..bbc264cb4e781da765abe068b3a69686c7efa8ea 100644
--- a/src/layersurface.c
+++ b/src/layersurface.c
@@ -348,6 +348,13 @@ phosh_layer_surface_unmap (GtkWidget *widget)
 }
 
 
+static void
+phosh_layer_surface_configured_impl (PhoshLayerSurface *layer_surface)
+{
+  /* Nothing todo here */
+}
+
+
 static void
 phosh_layer_surface_dispose (GObject *object)
 {
@@ -366,6 +373,7 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
 {
   GObjectClass *object_class = (GObjectClass *)klass;
   GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+  PhoshLayerSurfaceClass *layer_surface_class = PHOSH_LAYER_SURFACE_CLASS (klass);
 
   object_class->dispose = phosh_layer_surface_dispose;
   object_class->set_property = phosh_layer_surface_set_property;
@@ -375,6 +383,8 @@ phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
   widget_class->map = phosh_layer_surface_map;
   widget_class->unmap = phosh_layer_surface_unmap;
 
+  layer_surface_class->configured = phosh_layer_surface_configured_impl;
+
   props[PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL] =
     g_param_spec_pointer (
       "layer-shell",
diff --git a/src/lockscreen.c b/src/lockscreen.c
index 7b60f3840a6d0984d75934ef92847dc55b2e74cd..07e985cd056b30dcbf1c389b4169c48dc07c3d80 100644
--- a/src/lockscreen.c
+++ b/src/lockscreen.c
@@ -39,6 +39,8 @@
 #define LOCKSCREEN_LARGE_DATE_AND_TIME_CLASS "p-large"
 #define LOCKSCREEN_SMALL_DATE_AND_TIME_CLASS "p-small"
 
+#define LOCKSCREEN_SMALL_DISPLAY 700
+
 /**
  * PhoshLockscreen:
  *
@@ -98,7 +100,6 @@ typedef struct {
   GtkGesture        *long_press_del_gesture;
   GtkWidget         *lbl_unlock_status;
   GtkWidget         *btn_submit;
-  GtkWidget         *btn_emergency;
   guint              idle_timer;
   gint64             last_input;
   PhoshAuth         *auth;
@@ -798,11 +799,34 @@ phosh_lockscreen_dispose (GObject *object)
 }
 
 
+static void
+phosh_lockscreen_configured (PhoshLayerSurface *layer_surface)
+{
+  PhoshLockscreen *self = PHOSH_LOCKSCREEN (layer_surface);
+  PhoshLockscreenPrivate *priv;
+  guint height, margin = 100;
+
+  g_return_if_fail (PHOSH_IS_LOCKSCREEN (self));
+
+  priv = phosh_lockscreen_get_instance_private (self);
+  height = phosh_layer_surface_get_configured_height (layer_surface);
+
+  /* Avoid margin on smaller displays */
+  if (height < LOCKSCREEN_SMALL_DISPLAY)
+    margin = 0;
+
+  gtk_widget_set_margin_top (GTK_WIDGET (priv->box_unlock), margin);
+
+  PHOSH_LAYER_SURFACE_CLASS (phosh_lockscreen_parent_class)->configured (layer_surface);
+}
+
+
 static void
 phosh_lockscreen_class_init (PhoshLockscreenClass *klass)
 {
   GObjectClass *object_class = (GObjectClass *)klass;
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  PhoshLayerSurfaceClass *layer_surface_class = PHOSH_LAYER_SURFACE_CLASS (klass);
 
   object_class->constructed = phosh_lockscreen_constructed;
   object_class->dispose = phosh_lockscreen_dispose;
@@ -810,6 +834,8 @@ phosh_lockscreen_class_init (PhoshLockscreenClass *klass)
   object_class->set_property = phosh_lockscreen_set_property;
   object_class->get_property = phosh_lockscreen_get_property;
 
+  layer_surface_class->configured = phosh_lockscreen_configured;
+
   props[PROP_CALLS_MANAGER] =
     g_param_spec_object ("calls-manager",
                          "",
@@ -861,7 +887,6 @@ phosh_lockscreen_class_init (PhoshLockscreenClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, lbl_unlock_status);
   gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, long_press_del_gesture);
   gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, btn_submit);
-  gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, btn_emergency);
 
   gtk_widget_class_bind_template_callback (widget_class, long_press_del_cb);
   gtk_widget_class_bind_template_callback (widget_class, delete_button_clicked_cb);
diff --git a/src/ui/lockscreen.ui b/src/ui/lockscreen.ui
index 1f754cde090fe063122abc9a1e8dced47ccf1489..49c31e354f3dc04edf51ae36877a713f1c65b3bd 100644
--- a/src/ui/lockscreen.ui
+++ b/src/ui/lockscreen.ui
@@ -76,17 +76,14 @@
               <object class="GtkBox" id="box_info">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
-                <property name="can_focus">False</property>
                 <property name="expand">True</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="valign">end</property>
                         <property name="margin_top">6</property>
                         <property name="margin_bottom">32</property>
@@ -105,7 +102,6 @@
                     <child>
                       <object class="GtkImage" id="lock-arrow">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixel_size">32</property>
                         <property name="icon_name">swipe-arrow-symbolic</property>
                         <style>
@@ -128,7 +124,6 @@
                 <child type="center">
                   <object class="GtkBox" id="box_datetime">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="vexpand">True</property>
                     <property name="orientation">vertical</property>
@@ -141,7 +136,6 @@
                       <object class="GtkLabel" id="lbl_clock">
                         <property name="visible">True</property>
                         <property name="name">phosh-lockscreen-clock</property>
-                        <property name="can_focus">False</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">False</property>
@@ -154,14 +148,12 @@
                       <object class="GtkLabel" id="lbl_date">
                         <property name="visible">True</property>
                         <property name="name">phosh-lockscreen-date</property>
-                        <property name="can_focus">False</property>
                         <property name="valign">center</property>
                       </object>
                     </child>
                     <child>
                       <object class="HdyClamp">
                         <property name="visible" bind-source="media_player" bind-property="visible" bind-flags="sync-create"/>
-                        <property name="can_focus">False</property>
                         <property name="maximum_size">360</property>
                         <property name="margin_top">6</property>
                         <property name="vexpand">True</property>
@@ -186,7 +178,6 @@
                         <child>
                           <object class="HdyClamp">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="maximum_size">360</property>
                             <property name="margin_top">6</property>
                             <property name="vexpand">True</property>
@@ -219,7 +210,6 @@
             <child>
               <object class="GtkBox" id="box_unlock">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -228,7 +218,6 @@
                 <child>
                   <object class="GtkLabel" id="lbl_unlock_status">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Enter Passcode</property>
                     <attributes>
                       <attribute name="font-desc" value="Cantarell 16"/>
@@ -276,21 +265,7 @@
                     <property name="margin_start">16</property>
                     <property name="margin_end">16</property>
                     <property name="halign">center</property>
-                    <child>
-                      <object class="GtkButton" id="btn_emergency">
-                        <property name="visible">False</property>
-                        <property name="label" translatable="yes">Emergency</property>
-                        <style>
-                          <class name="text-only-button"/>
-                          <class name="circular"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="pack_type">start</property>
-                      </packing>
-                    </child>
+
                     <child>
                       <object class="GtkButton" id="btn_submit">
                         <property name="visible">True</property>
@@ -302,11 +277,6 @@
                           <class name="circular"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="pack_type">end</property>
-                      </packing>
                     </child>
                   </object>
                 </child>