diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlElement.java b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlElement.java
index 2d34a76..9fc2dff 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlElement.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlElement.java
@@ -30,9 +30,9 @@
 	
 	public MapTerm toMap() {
 		MapTerm res = new MapTerm();
-		res.insert("\"type\"", new Constant(type));
+		res.insert("\"type\"", new Constant("\"" + type + "\""));
 		res.insert("\"id\"", new Constant(id));
-		res.insert("\"text\"", new Constant("\"" + text + "\""));
+		res.insert("\"text\"", new Constant(text));
 		MapTerm stylesMap = new MapTerm();
 		for(String prop : styles.keySet()) {
 			stylesMap.insert(prop, new Constant(styles.get(prop)));
diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java
index e622697..a4c56eb 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java
@@ -89,15 +89,11 @@
 					}
 				}
 
-
-
 				sendElements.addMember("\"add\"", addElements);
 				sendElements.addMember("\"delete\"", delElements);
 				sendData.addMember("\"data\"", sendElements);
-
 				ws.send(sendData.toString());
 			}
-
 		}
 	}
 
@@ -114,12 +110,10 @@
 				Expression type = widget.get("\"type\"");
 
 				switch(type.toString()) {
-				case "button":
+				case "\"button\"":
 					addButton(widget, newWid, addElements);
 					break;
-
 				}
-
 			}
 		}
 
@@ -129,7 +123,7 @@
 		String text = widget.get("\"text\"").toString();
 		HtmlElement button = new HtmlElement("button", wid, text);
 		elements.put(wid, button);
-		addElements.append(new Constant(wid));
+		addElements.append(button.toMap());
 	}
 
 	private void deleteOldWidgets(Set<String> oldWidSet, ListTerm delElements) {