diff --git a/src/objects/window/private.h b/src/objects/window/private.h
index 2cd19ef..e61a468 100644
--- a/src/objects/window/private.h
+++ b/src/objects/window/private.h
@@ -73,5 +73,4 @@
     G_GNUC_INTERNAL void pw3270_window_open_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
     G_GNUC_INTERNAL void pw3270_window_close_activated(GSimpleAction * action, GVariant *parameter, gpointer application);
 
-
 #endif // PRIVATE_H_INCLUDED
diff --git a/src/objects/window/window.c b/src/objects/window/window.c
index 46ee26b..b7ea0e5 100644
--- a/src/objects/window/window.c
+++ b/src/objects/window/window.c
@@ -145,7 +145,7 @@
 
 			"win.copy",
 			"win.paste",
-			"win.select_all",
+			"win.select-all",
 			"separator",
 			"win.connect",
 			"win.disconnect",
diff --git a/ui/application.xml b/ui/application.xml
index 0dc1bcc..e26b9df 100644
--- a/ui/application.xml
+++ b/ui/application.xml
@@ -154,12 +154,12 @@
 
         <item>
           <attribute name="label" translatable="yes">Select all</attribute>
-          <attribute name="action">win.select_all</attribute>
+          <attribute name="action">win.select-all</attribute>
         </item>
 
         <item>
           <attribute name="label" translatable="yes">Select Field</attribute>
-          <attribute name="action">win.select_field</attribute>
+          <attribute name="action">win.select-field</attribute>
         </item>
 
         <item>
@@ -241,10 +241,30 @@
           <attribute name="action">win.set.colors</attribute>
         </item>
 
-        <item>
+        <submenu>
+          <attribute name="label" translatable="yes">Screen size</attribute>
+            <item>
+              <attribute name="label" translatable="yes">Model 2 - 80x24</attribute>
+              <attribute name="action">win.set-model</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Model 3 - 80x32</attribute>
+              <attribute name="action">win.set-model</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Model 4 - 80x43</attribute>
+              <attribute name="action">win.set-model</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Model 5 - 132x27</attribute>
+              <attribute name="action">win.set-model</attribute>
+            </item>
+
+        </submenu>
+
+        <submenu id='font-select-placeholder'>
           <attribute name="label" translatable="yes">Select font</attribute>
-          <attribute name="action">win.select.font</attribute>
-        </item>
+        </submenu>
 
         <item>
           <attribute name="label" translatable="yes">Screen sizes</attribute>
--
libgit2 0.21.2