diff --git a/android/jni/main.cpp b/android/jni/main.cpp
index 3bb13e6..9b6f58c 100644
--- a/android/jni/main.cpp
+++ b/android/jni/main.cpp
@@ -61,11 +61,6 @@ static void post_message(H3270 *session, int msgid, int arg1 = 0, int arg2 = 0)
 	}
 }
 
-static void update_status(H3270 *session, LIB3270_MESSAGE id)
-{
-	post_message(session,1,id);
-}
-
 static void changed(H3270 *session, int offset, int len)
 {
 	post_message(session,2,offset,len);
@@ -253,7 +248,6 @@ JNIEXPORT jint JNICALL Java_br_com_bb_pw3270_lib3270_init(JNIEnv *env, jclass ob
 
 	session->write			= write_buffer;
 	session->changed 		= changed;
-	session->update_status 	= update_status;
 	session->erase			= erase;
 	session->ctlr_done		= ctlr_done;
 
diff --git a/android/res/raw/jsmain.js b/android/res/raw/jsmain.js
index 9046c1b..5c16b35 100644
--- a/android/res/raw/jsmain.js
+++ b/android/res/raw/jsmain.js
@@ -1,4 +1,26 @@
 
+function setupButtons()
+{
+	var form = document.getElementById("form3270");
+
+	if(form == undefined)
+		return;
+
+	for(var i=0;i < form.elements.length;i++)
+	{
+		if(form.elements[i].name.substr(0,2) == "PF")
+		{
+			form.elements[i].pfkey = parseInt(form.elements[i].name.substr(3));
+			
+			form.elements[i].onclick = function()
+			{
+				pw3270.pfkey(this.pfkey);
+			}
+		}
+	}
+
+}
+
 function initialize()
 {
 	updateScreen();
@@ -7,6 +29,7 @@ function initialize()
 function updateScreen()
 {
 	document.getElementById("terminal").innerHTML = pw3270.getscreencontents();
+	setupButtons();
 }
 
 function pfkey(id)
@@ -30,9 +53,9 @@ function xmit()
 			}
 		}
 	}
-	
+
 	pw3270.sendEnter();
-	
+
 	return false;
 }
 
diff --git a/android/res/raw/theme.css b/android/res/raw/theme.css
index ae1fed0..bd3210b 100644
--- a/android/res/raw/theme.css
+++ b/android/res/raw/theme.css
@@ -94,7 +94,7 @@ a
 
 .IW002
 {
-	width: 2em;
+	width: 1.3em;
 }
 
 .IW003
diff --git a/src/lib3270/html.c b/src/lib3270/html.c
index 73f398b..04abd49 100644
--- a/src/lib3270/html.c
+++ b/src/lib3270/html.c
@@ -316,8 +316,9 @@
 									append_string(&info,name);
 									append_string(&info,"\" value=\"");
 									append_string(&info,ptr);
-									append_string(&info,"\"");
+									append_string(&info,"\" />");
 									info.mode  = HTML_MODE_INPUT_BUTTON;
+									info.maxlength = 0;
 									info.input = info.text+strlen(info.text);
 
 								}
@@ -331,7 +332,7 @@
 						append_string(&info,"&nbsp;");
 					}
 				}
-				else
+				else if(info.mode != HTML_MODE_INPUT_BUTTON)
 				{
 					// Normal text
 					if(info.mode == HTML_MODE_TEXT)
--
libgit2 0.21.2