diff --git a/src/pw3270/uiparser/button.c b/src/pw3270/uiparser/button.c
index f0242b8..ae9a0e4 100644
--- a/src/pw3270/uiparser/button.c
+++ b/src/pw3270/uiparser/button.c
@@ -84,7 +84,7 @@
  	GtkAction		* action	= NULL;
 
 	if(label) {
-		keypad->widget = gtk_button_new_with_label(label);
+		keypad->widget = gtk_button_new_with_label(gettext(g_strcompress(label)));
 	} else {
 		gchar *text = g_strconcat("gtk-",icon,NULL);
 		keypad->widget = gtk_button_new();
@@ -92,25 +92,6 @@
 		g_free(text);
 	}
 
- 	/*
- 	const gchar		* label		= ui_get_attribute("label", names, values);
- 	const gchar		* icon		= ui_get_attribute("icon", names, values);
- 	const gchar		* name		= ui_get_attribute("action", names, values);
-	GtkWidget		* widget	= NULL;
-
-	if(label)
-	{
-		widget = gtk_button_new_with_label(gettext(g_strcompress(label)));
-	}
-	else if(icon)
-	{
-		gchar *text = g_strconcat("gtk-",icon,NULL);
-		widget = gtk_button_new();
-		gtk_container_add(GTK_CONTAINER(widget),gtk_image_new_from_stock(text,GTK_ICON_SIZE_SMALL_TOOLBAR));
-		g_free(text);
-	}
-*/
-
 #if GTK_CHECK_VERSION(2,18,0)
 	gtk_widget_set_can_focus(keypad->widget,FALSE);
 	gtk_widget_set_can_default(keypad->widget,FALSE);
diff --git a/src/pw3270/uiparser/keypad.c b/src/pw3270/uiparser/keypad.c
index f8f0706..d3195db 100644
--- a/src/pw3270/uiparser/keypad.c
+++ b/src/pw3270/uiparser/keypad.c
@@ -28,11 +28,15 @@
  */
 
  #include "keypad.h"
+ #include <stdlib.h>
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
  static void element_start(GMarkupParseContext *context, const gchar *element_name, const gchar **names,const gchar **values, struct keypad *keypad, GError **error)
  {
+	int			  width 	= 1;
+	int			  height	= 1;
+
  	trace("%s(%s,%d,%d)",__FUNCTION__,element_name,(int) keypad->row, (int) keypad->col);
 
  	keypad->widget = NULL;
@@ -41,24 +45,45 @@
 		keypad_button_start(context, names, values, error, keypad);
  	}
 
- }
-
- static void element_end(GMarkupParseContext *context, const gchar *element_name, struct keypad *keypad, GError **error)
- {
  	if(keypad->widget) {
-		gtk_grid_attach(keypad->grid,keypad->widget,keypad->col,keypad->row,1,1);
+
+		// Criou widget, incluir
+		const gchar	* tmp;
+
+		tmp = ui_get_attribute("width", names, values);
+		if(tmp) {
+			width = atoi(tmp);
+		}
+
+		tmp = ui_get_attribute("height", names, values);
+		if(tmp) {
+			height = atoi(tmp);
+		}
+
+		tmp = ui_get_attribute("column", names, values);
+		if(tmp) {
+			keypad->col = atoi(tmp);
+		}
+
+		gtk_grid_attach(keypad->grid,keypad->widget,keypad->col,keypad->row,width,height);
 		keypad->widget = NULL;
+
  	}
 
  	if(!strcasecmp(element_name,"row")) {
 		keypad->row++;
 		keypad->col = 0;
  	} else {
-		keypad->col++;
+		keypad->col += width;
  	}
 
  }
 
+ static void element_end(GMarkupParseContext *context, const gchar *element_name, struct keypad *keypad, GError **error)
+ {
+
+ }
+
  static void toggled(GtkToggleAction *action, GtkWidget *widget)
  {
  	gboolean active = gtk_toggle_action_get_active(action);
@@ -145,7 +170,7 @@
 	keypad->relief		= ui_get_relief(names, values, GTK_RELIEF_NORMAL);
 	keypad->grid		= GTK_GRID(gtk_grid_new());
 
-	gtk_grid_set_row_homogeneous(keypad->grid,TRUE);
+	// gtk_grid_set_row_homogeneous(keypad->grid,TRUE);
 	gtk_grid_set_column_homogeneous(keypad->grid,TRUE);
 
 	g_object_set_data(G_OBJECT(keypad->grid),"position",(gpointer) keypad->pos);
diff --git a/ui/10keypad.xml b/ui/10keypad.xml
index 4dfd025..805ff01 100644
--- a/ui/10keypad.xml
+++ b/ui/10keypad.xml
@@ -34,64 +34,60 @@
 	<keypad name="keypad.right" label="Lateral keypad" position="right" key='<alt>k' relief='half' >
 
 		<row>
-			<button action='pfkey' id='1' label='PF1' />
-			<button action='pfkey' id='2' label='PF2' />
-			<button action='pfkey' id='3' label='PF3' />
+			<button action='pfkey' id='1' label='PF1' width='2'/>
+			<button action='pfkey' id='2' label='PF2' width='2' />
+			<button action='pfkey' id='3' label='PF3' width='2' />
 		</row>
 		<row>
-			<button action='pfkey' id='4' label='PF4' />
-			<button action='pfkey' id='5' label='PF5' />
-			<button action='pfkey' id='6' label='PF6' />
+			<button action='pfkey' id='4' label='PF4' width='2' />
+			<button action='pfkey' id='5' label='PF5' width='2' />
+			<button action='pfkey' id='6' label='PF6' width='2' />
 		</row>
 		<row>
-			<button action='pfkey' id='7' label='PF7' />
-			<button action='pfkey' id='8' label='PF8' />
-			<button action='pfkey' id='9' label='PF9' />
+			<button action='pfkey' id='7' label='PF7' width='2' />
+			<button action='pfkey' id='8' label='PF8' width='2' />
+			<button action='pfkey' id='9' label='PF9' width='2' />
 		</row>
 		<row>
-			<button action='pfkey' id='10' label='PF10' />
-			<button action='pfkey' id='11' label='PF11' />
-			<button action='pfkey' id='12' label='PF12' />
+			<button action='pfkey' id='10' label='PF10' width='2' />
+			<button action='pfkey' id='11' label='PF11' width='2' />
+			<button action='pfkey' id='12' label='PF12' width='2' />
 		</row>
 		<row>
-			<button />
-			<button action='move' target='cursor' direction='up' icon="go-up" />
-			<button />
+			<button action='move' target='cursor' direction='up' icon="go-up"  column='2' width='2' />
 		</row>
 		<row>
-			<button action='move' target='cursor' direction='left' icon="go-back" />
-			<button action="firstfield" icon="goto-top" />
-			<button action='move' target='cursor' direction='right' icon="go-forward" />
+			<button action='move' target='cursor' direction='left' icon="go-back" width='2' />
+			<button action="firstfield" icon="goto-top" width='2' />
+			<button action='move' target='cursor' direction='right' icon="go-forward" width='2' />
 		</row>
 		<row>
-			<button />
-			<button action='move' target='cursor' direction='down' icon="go-down"/>
-			<button />
+			<button action='move' target='cursor' direction='down' icon="go-down" column='2' width='2'/>
 		</row>
 		<row>
-			<button action='pakey' id='1' label='PA1' />
-			<button action='pakey' id='2' label='PA2' />
-			<button action='pakey' id='3' label='PA3' />
+			<button action='pakey' id='1' label='PA1' width='2' />
+			<button action='pakey' id='2' label='PA2' width='2' />
+			<button action='pakey' id='3' label='PA3' width='2' />
 		</row>
 		<row>
-			<button action='PreviousField' icon="goto-first" />
-			<button action='NextField' icon="goto-last" />
+			<button action='PreviousField' icon="goto-first" width='3' />
+			<button action='NextField' icon="goto-last" width='3' />
 		</row>
 		<row>
-			<button action='erase' target='all' label="Clear" />
-			<button action='kybdreset' label="Reset" />
+			<button action='erase' target='all' label="Clear" width='3' />
+			<button action='kybdreset' label="Reset" width='3' />
 		</row>
 		<row>
-			<button action='EraseEOF' label="Erase\nEOF" />
-			<button action='EraseInput' label="Erase\nInput" />
+			<button action='EraseEOF' label="Erase\nEOF" width='3' />
+			<button action='EraseInput' label="Erase\nInput" width='3' />
 		</row>
 		<row>
-			<button action='Attn' label="Attn" />
-			<button action='Break' label="Break" />
+			<button action='Attn' label="Attn" width='3' />
+			<button action='Break' label="Break" width='3' />
 		</row>
 
 		<row>
-			<button action='Enter' icon="ok" />
+			<button action='Enter' icon="ok" width='6'/>
 		</row>
 
 	</keypad>
--
libgit2 0.21.2