diff --git a/ajaxui/ajaxui_config_channels.c b/ajaxui/ajaxui_config_channels.c
index ac874dcf..8c11f4f8 100644
--- a/ajaxui/ajaxui_config_channels.c
+++ b/ajaxui/ajaxui_config_channels.c
@@ -208,16 +208,15 @@ ajax_config_channels_tab(http_connection_t *hc, http_reply_t *hr)
   ajax_box_begin(tq, AJAX_BOX_BORDER, NULL, NULL, NULL);
 
   tcp_qprintf(tq,
-	      "<div style=\"height: 20px\">"
+	      "<div style=\"height: 25px\">"
 	      "<div style=\"float: left\">"
-	      "<input class=\"textinput\" type=\"text\" id=\"newchgrp\">"
+	      "<input type=\"text\" id=\"newchgrp\">"
 	      "</div>"
-	      "<div style=\"padding-top:2px\" class=\"chgroupaction\">"
-	      "<a href=\"javascript:void(0)\" "
+	      "<div style=\"float: right\">"
+	      "<input type=\"button\" value=\"Add\" "
 	      "onClick=\"javascript:addlistentry_by_widget("
 	      "'channelgrouplist', 'chgroup_add', 'newchgrp');\">"
-	      "Add</a></div>"
-	      "</div>");
+	      "</div></div>");
     
   ajax_box_end(tq, AJAX_BOX_BORDER);
     
diff --git a/ajaxui/ajaxui_config_dvb.c b/ajaxui/ajaxui_config_dvb.c
index c06a398a..403f3d26 100644
--- a/ajaxui/ajaxui_config_dvb.c
+++ b/ajaxui/ajaxui_config_dvb.c
@@ -221,25 +221,26 @@ ajax_adaptereditor(http_connection_t *hc, http_reply_t *hr,
   tcp_qprintf(tq, "<div style=\"float: left; width:55%%\">");
 
   tcp_qprintf(tq, "<div style=\"overflow: auto; width:100%%\">");
-  ajax_a_jsfuncf(tq, "Rename adapter...",
-		 "dvb_adapter_rename('%s', '%s');",
-		 tda->tda_identifier, tda->tda_displayname);
+
+  tcp_qprintf(tq, 
+	      "<input type=\"button\" value=\"Rename adapter...\" "
+	      "onClick=\"dvb_adapter_rename('%s', '%s');\">",
+	      tda->tda_identifier, tda->tda_displayname);
 
   if(tda->tda_rootpath == NULL) {
-    tcp_qprintf(tq, " / ");
-    
-    ajax_a_jsfuncf(tq, "Delete adapter...",
-		   "dvb_adapter_delete('%s', '%s');",
-		   tda->tda_identifier, tda->tda_displayname);
+    tcp_qprintf(tq, 
+		"<input type=\"button\" value=\"Delete adapter...\" "
+		"onClick=\"dvb_adapter_delete('%s', '%s');\">",
+		tda->tda_identifier, tda->tda_displayname);
   }
 
-  tcp_qprintf(tq, "</div>");
+  //  tcp_qprintf(tq, "</div>");
 
   /* Clone adapter */
 
-  tcp_qprintf(tq, "<div style=\"overflow: auto; width:100%%\">");
+  //  tcp_qprintf(tq, "<div style=\"overflow: auto; width:100%%\">");
   tcp_qprintf(tq,
-	      "<select class=\"textinput\" "
+	      "<select "
 	      "onChange=\"new Ajax.Request('/ajax/dvbadapterclone/%s', "
 	      "{parameters: { source: this.value }})\">",
 	      tda->tda_identifier);
diff --git a/ajaxui/tvheadend.js b/ajaxui/tvheadend.js
index e385f106..66a34084 100644
--- a/ajaxui/tvheadend.js
+++ b/ajaxui/tvheadend.js
@@ -96,10 +96,10 @@ function makedivinput(id, url)
 {
 	$(id).innerHTML='<div style="width:100%; overflow:auto">' + 
 	'<div style="width:75%; float:left">' + 
-	'<input id="val' + id + '" type="password" class="textinput">' +
+	'<input id="val' + id + '" type="password">' +
 	'</div>' + 
 	'<div style="width:25%; float:left">' + 
-	'<input class="textinput" type="button" value="Set" ' + 
+	'<input type="button" value="Set" ' + 
 	'onClick="new Ajax.Request(\'' + url + '\', ' +
 	'{parameters: {value: $F(\'val' + id + '\')}})">' +
 	'</div></div>';