diff --git a/js/HTML.js b/js/HTML.js
index b653a99bd..3b7a39090 100644
--- a/js/HTML.js
+++ b/js/HTML.js
@@ -123,7 +123,8 @@ Static method to construct a slider
 */
 HTML.slider = function(type,label,tooltip,body) {
 	var attributes = {
-		"class": "tw-slider"
+		"class": "tw-slider",
+		"data-tw-slider-type": type
 	};
 	if(tooltip) {
 		attributes.alt = tooltip;
@@ -141,7 +142,8 @@ HTML.slider = function(type,label,tooltip,body) {
 			),
 			HTML.elem("div",
 				{
-					"class": ["tw-slider-body"]
+					"class": ["tw-slider-body"],
+					"style": {"display": "none"}
 				},
 				body
 			)
diff --git a/js/macros/info.js b/js/macros/info.js
index b5157d8be..e34db57d7 100644
--- a/js/macros/info.js
+++ b/js/macros/info.js
@@ -31,22 +31,22 @@ exports.macro = {
 			var parseTree = store.parseTiddler(tiddler.title);
 			switch(info) {
 				case "parsetree":
-					return HTML(HTML.slider(type,
+					return HTML(HTML.slider("parsetree",
 										"Parse tree",
 										"The parse tree for this tiddler",
-										parseTree.toString(type)),type);
+										HTML.raw(parseTree.toString(type))),type);
 					//break;
 				case "compiled":
-					return HTML(HTML.slider(type,
+					return HTML(HTML.slider("compiled",
 										"Render functions",
 										"The render functions for this tiddler",
-										parseTree.compile(type).toString(type)),type);
+										HTML.raw(parseTree.compile(type).toString(type))),type);
 					//break;
 				case "dependencies":
-					return HTML(HTML.slider(type,
+					return HTML(HTML.slider("dependencies",
 										"Dependencies",
 										"The dependencies for this tiddler",
-										(parseTree.dependencies === null) ? "*" : encoder(parseTree.dependencies.join(", "))),type);
+										HTML.raw((parseTree.dependencies === null) ? "*" : encoder(parseTree.dependencies.join(", ")))),type);
 					//break;
 			}
 		}
diff --git a/js/macros/slider.js b/js/macros/slider.js
index 681ee1462..82518a8ca 100644
--- a/js/macros/slider.js
+++ b/js/macros/slider.js
@@ -7,7 +7,8 @@ title: js/macros/slider.js
 /*jslint node: true */
 "use strict";
 
-var utils = require("../Utils.js");
+var HTML = require("../HTML.js").HTML,
+	utils = require("../Utils.js");
 
 exports.macro = {
 	name: "slider",
@@ -28,10 +29,10 @@ exports.macro = {
 	},
 	render: function(type,tiddler,store,params) {
 		if(type === "text/html") {
-			return utils.stitchSlider(type,
+			return HTML(HTML.slider(params.name,
 										params.label,
 										params.tooltip,
-										store.renderTiddler(type,params.targetTiddler));
+										HTML.raw(store.renderTiddler(type,params.targetTiddler))),type);
 		} else if(type === "text/plain") {
 			return store.renderTiddler(type,params.target);
 		}