diff --git a/draft/library/wsf_js_widget/kernel/navbar/wsf_navbar_control.e b/draft/library/wsf_js_widget/kernel/navbar/wsf_navbar_control.e
index db8ac178..06a70be2 100644
--- a/draft/library/wsf_js_widget/kernel/navbar/wsf_navbar_control.e
+++ b/draft/library/wsf_js_widget/kernel/navbar/wsf_navbar_control.e
@@ -51,7 +51,7 @@ feature -- Rendering
 		do
 			temp := render_tag_with_tagname ("span", "", "", "icon-bar")
 			temp.multiply (3)
-			temp := render_tag_with_tagname ("button", temp, "", "navbar-toggle")
+			temp := render_tag_with_tagname ("button", temp, "data-target=%".navbar-collapse%" data-toggle=%"collapse%" type=%"button%"", "navbar-toggle")
 			if attached brand as b then
 				temp.append (render_tag_with_tagname ("a", b, "href=%"#%"", "navbar-brand"))
 			end
@@ -60,7 +60,7 @@ feature -- Rendering
 			if nav_right.controls.count > 0 then
 				nav_string.append (nav_right.render)
 			end
-			temp.append (render_tag_with_tagname ("div", nav_string, "", "navbar-collapse"))
+			temp.append (render_tag_with_tagname ("div", nav_string, "", "navbar-collapse collapse"))
 			Result := render_tag_with_tagname ("div", temp, "", "container")
 			Result := render_tag (Result, "")
 		end
diff --git a/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item.e b/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item.e
new file mode 100644
index 00000000..4e84e0e8
--- /dev/null
+++ b/draft/library/wsf_js_widget/kernel/navlist/wsf_navlist_item.e
@@ -0,0 +1,28 @@
+note
+	description: "Summary description for {WSF_NAVLIST_ITEM}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_NAVLIST_ITEM
+
+inherit
+
+	WSF_BUTTON_CONTROL
+		rename
+			make as make_button
+		end
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (n, t: STRING)
+		do
+			make_control (n, "a")
+			text := t
+		end
+
+end
diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e
new file mode 100644
index 00000000..23eac886
--- /dev/null
+++ b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_layout_control.e
@@ -0,0 +1,49 @@
+note
+	description: "Summary description for {WSF_LAYOUT_CONTROL}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_LAYOUT_CONTROL
+
+inherit
+
+	WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL]
+		rename
+			make as make_multi_control,
+			add_control as add_control_raw
+		end
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (n: STRING)
+		do
+			make_with_tag_name (n, "div")
+			add_class ("row")
+		end
+
+feature -- Add control
+
+	add_control_with_offset (c: WSF_STATELESS_CONTROL; span, offset: INTEGER)
+		local
+			div: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL]
+		do
+			create div.make (control_name + "_item_" + controls.count.out)
+			div.add_class ("col-md-" + span.out + " col-md-offset-" + offset.out)
+			div.add_control (c)
+		end
+
+	add_control (c: WSF_STATELESS_CONTROL; span: INTEGER)
+		local
+			div: WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL]
+		do
+			create div.make (control_name + "_item_" + controls.count.out)
+			div.add_class ("col-md-" + span.out)
+			div.add_control (c)
+		end
+
+end
diff --git a/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf b/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
index 6352471f..785c18e6 100644
--- a/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
+++ b/draft/library/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -16,6 +16,8 @@
 		<library name="pcre" location="$ISE_LIBRARY\unstable\library\text\regexp\pcre\pcre-safe.ecf"/>
 		<library name="uri_template" location="..\..\..\library\text\parser\uri_template\uri_template-safe.ecf"/>
 		<library name="wsf" location="..\..\..\library\server\wsf\wsf-safe.ecf"/>
-		<cluster name="kernel" location=".\kernel\" recursive="true"/>
+		<cluster name="kernel" location=".\kernel\" recursive="true">
+			<cluster name="navlist" location="\home\severin\Documents\EWF\EWF\draft\library\wsf_js_widget\kernel\navlist\"/>
+		</cluster>
 	</target>
 </system>