diff --git a/view/theme/dispy-dark/bottom.tpl b/view/theme/dispy-dark/bottom.tpl
index 1b7dda8f85..a0298a7de9 100644
--- a/view/theme/dispy-dark/bottom.tpl
+++ b/view/theme/dispy-dark/bottom.tpl
@@ -1 +1,52 @@
 <script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+
+});
+function tautogrow(id) {
+	$("textarea#comment-edit-text-" + id).autogrow();
+};
+
+function insertFormatting(comment, BBcode, id) {
+	var tmpStr = $("#comment-edit-text-" + id).val();
+	if(tmpStr == comment) {
+		tmpStr = "";
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+	textarea = document.getElementById("comment-edit-text-" + id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url") {
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+		} else {
+			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+		}
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url") {
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
+			+ "http://" + textarea.value.substring(start, end)
+			+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+		} else {
+			textarea.value = textarea.value.substring(0, start)
+			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
+			+ textarea.value.substring(end, textarea.value.length);
+		}
+	}
+	return true;
+}
+
+function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+	$(".comment-edit-bb-" + id + "> li").css({visibility: 'visible'});
+	
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+	$(".comment-edit-bb-" + id + "> li").css({visibility: 'none'});
+}
+</script>
diff --git a/view/theme/dispy-dark/comment_item.tpl b/view/theme/dispy-dark/comment_item.tpl
index adf2772af0..371477c5b9 100644
--- a/view/theme/dispy-dark/comment_item.tpl
+++ b/view/theme/dispy-dark/comment_item.tpl
@@ -11,14 +11,49 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<ul class="comment-edit-bb-$id">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','b', $id);"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','i', $id);"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','u', $id);"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','quote', $id);"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','code', $id);"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','img', $id);"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','url', $id);"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','video', $id);"></a></li>
+				</ul>
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-$id"
+					class="comment-edit-text-empty"
+					name="body"
+					onfocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"
+					onblur="commentClose(this,$id);cmtBbClose($id);"
+					placeholder="Comment">$comment</textarea>
 				{{ if $qcomment }}
                 <div class="qcomment-wrapper">
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
+					<select id="qcomment-select-$id"
+						name="qcomment-$id"
+						class="qcomment"
+						onchange="qCommentInsert(this,$id);">
 					<option value=""></option>
-				{{ for $qcomment as $qc }}
+					{{ for $qcomment as $qc }}
 					<option value="$qc">$qc</option>
-				{{ endfor }}
+					{{ endfor }}
 					</select>
 				</div>
 				{{ endif }}
diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php
index 729f9be2ad..c3e6c91196 100644
--- a/view/theme/dispy-dark/default.php
+++ b/view/theme/dispy-dark/default.php
@@ -10,6 +10,9 @@
 		<?php if(x($page, 'header')) echo $page['header']; ?>
 	</header>
 	<article id="articlemain">
+		<header id="articleheader">
+			<?php if(x($page, 'articleheader')) echo $page['articleheader']; ?>
+		</header>
 		<?php if(x($page,'nav')) echo $page['nav']; ?>
 		<aside id="asideleft">
 			<?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
@@ -17,7 +20,8 @@
 		</aside>
 		<section id="sectionmain">
 			<?php if(x($page,'content')) echo $page['content']; ?>
-			<footer id="section-footer"></footer>
+			<footer id="sectionfooter">
+			</footer>
 		</section>
 		<aside id="asidemain">
 			<?php if(x($page,'aside')) echo $page['aside']; ?>
@@ -27,6 +31,9 @@
 			<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
 			<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
 		</aside>
+		<footer id="articlefooter">
+			<?php if(x($page, 'articlefooter')) echo $page['articlefooter']; ?>
+		</footer>
 	</article>
 	<footer id="footer">
 		<?php if(x($page, 'footer')) echo $page['footer']; ?>
diff --git a/view/theme/dispy-dark/editicons.png b/view/theme/dispy-dark/editicons.png
new file mode 100644
index 0000000000..51e0d98309
Binary files /dev/null and b/view/theme/dispy-dark/editicons.png differ
diff --git a/view/theme/dispy-dark/editicons.svg b/view/theme/dispy-dark/editicons.svg
new file mode 100644
index 0000000000..8804d09071
--- /dev/null
+++ b/view/theme/dispy-dark/editicons.svg
@@ -0,0 +1,725 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="250"
+   height="200"
+   contentStyleType="text/css"
+   contentScriptType="text/ecmascript"
+   sodipodi:docname="editicons.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   id="svg1"
+   inkscape:version="0.48+devel r"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy-dark/editicons.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <title
+     id="title4806">editicons</title>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8a8a8a"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="0"
+     inkscape:zoom="3.6894726"
+     inkscape:cx="54.191332"
+     inkscape:cy="133.63138"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg1"
+     showgrid="false"
+     inkscape:window-width="1100"
+     inkscape:window-height="740"
+     inkscape:window-x="34"
+     inkscape:window-y="42"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="false"
+     width="0px"
+     height="0px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>editicons</dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:date>2012-04-20</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li />
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>
+          <dc:title>DESCRIPTION</dc:title>
+        </dc:description>
+        <cc:license
+           rdf:resource="http://artlibre.org/licence/lal" />
+        <dc:language>en-CA</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://artlibre.org/licence/lal">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.43349891,-524.43349)" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4713"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,-66.847069)" />
+  <text
+     xml:space="preserve"
+     style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+     x="79.591835"
+     y="91.591835"
+     id="text4709"
+     transform="translate(-68.16293,-73.825339)"><tspan
+       sodipodi:role="line"
+       id="tspan4711"
+       x="79.591835"
+       y="91.591835"
+       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#e6e6e6;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold">B</tspan></text>
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4721"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,21.152934)" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4725"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,-66.847066)" />
+  <rect
+     transform="translate(-42.805152,-44.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4727"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4729"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,-22.84707)" />
+  <rect
+     transform="translate(-42.805152,-0.8470705)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4731"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4733"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,21.15293)" />
+  <rect
+     transform="translate(-20.805152,-66.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4735"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4737"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,-44.847066)" />
+  <rect
+     transform="translate(-20.805152,-22.84707)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4739"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4741"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,-0.8470705)" />
+  <rect
+     transform="translate(-20.805152,21.15293)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4743"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4745"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,-66.847066)" />
+  <rect
+     transform="translate(1.194848,-44.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4747"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4749"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,-22.84707)" />
+  <rect
+     transform="translate(1.194848,-0.8470705)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4751"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4753"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,21.15293)" />
+  <rect
+     transform="translate(-64.805152,-44.847069)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4715"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="4.7811713"
+     y="28.940323"
+     id="text4774"
+     transform="translate(6.806399,11)"><tspan
+       sodipodi:role="line"
+       id="tspan4776"
+       x="4.7811713"
+       y="28.940323"
+       style="font-size:18px">I</tspan></text>
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4717"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,-22.847069)" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="6.4507866"
+     y="61.118362"
+     id="text4778"
+     transform="translate(5,1)"><tspan
+       sodipodi:role="line"
+       id="tspan4780"
+       x="6.4507866"
+       y="61.118362"
+       style="font-size:18px">U</tspan></text>
+  <rect
+     transform="translate(-64.805152,-0.8470699)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4719"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="4.28688"
+     y="81.765083"
+     id="text4782"
+     transform="translate(7,0.7234271)"><tspan
+       sodipodi:role="line"
+       id="tspan4784"
+       x="4.28688"
+       y="81.765083"
+       style="font-size:18px">Q</tspan></text>
+  <g
+     id="g1783"
+     transform="translate(44.197715,-88)">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="2.9268293"
+       rx="2.9268293"
+       y="858.11218"
+       x="173.12502"
+       height="9"
+       width="14.5"
+       id="rect4387-8"
+       style="fill:#666666;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="translate(-168.97273,-762.7948)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       transform="matrix(1.1489362,0,0,1.1489362,-455.1097,-153.28349)"
+       d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z"
+       sodipodi:ry="2.71875"
+       sodipodi:rx="2.6875"
+       sodipodi:cy="220.26843"
+       sodipodi:cx="408.8125"
+       id="path4391-3"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="1"
+       rx="1"
+       y="859.06403"
+       x="174.89275"
+       height="1.8561553"
+       width="3.5355339"
+       id="rect4290"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       transform="translate(-168.97273,-762.7948)" />
+  </g>
+  <g
+     transform="translate(-65.063391,-846.33726)"
+     id="g1037">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:nodetypes="csccccscc"
+       inkscape:connector-curvature="0"
+       id="rect4428-4"
+       d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:connector-curvature="0"
+       id="path4440-4"
+       d="m 124.78127,905.73727 -1.9375,-0.063"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4442-9"
+       d="m 117.59377,901.20597 6.4375,0"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="908.11218"
+       x="115.28126"
+       height="0.375"
+       width="1.0625"
+       id="rect4446-9"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4448-3"
+       width="1.0625"
+       height="0.375"
+       x="115.34376"
+       y="906.51843" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="904.89343"
+       x="115.50001"
+       height="0.375"
+       width="1.0625"
+       id="rect4450-6"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4452-0"
+       width="1.0625"
+       height="0.375"
+       x="115.81251"
+       y="903.42468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="902.17468"
+       x="116.21876"
+       height="0.375"
+       width="1.0625"
+       id="rect4454-5"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4456-0"
+       width="1.0625"
+       height="0.375"
+       x="118.50001"
+       y="900.17468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="898.70593"
+       x="118.68751"
+       height="0.375"
+       width="1.0625"
+       id="rect4458-2"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4460-9"
+       width="1.0625"
+       height="0.375"
+       x="118.75001"
+       y="897.20593" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="895.79968"
+       x="118.75001"
+       height="0.375"
+       width="1.0625"
+       id="rect4462-4"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4464-3"
+       width="1.0625"
+       height="0.375"
+       x="120.84376"
+       y="908.11218" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="906.51843"
+       x="120.90627"
+       height="0.375"
+       width="1.0625"
+       id="rect4466-5"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4468-1"
+       width="1.0625"
+       height="0.375"
+       x="121.06252"
+       y="904.89343" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="903.42468"
+       x="121.37502"
+       height="0.375"
+       width="1.0625"
+       id="rect4470-7"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4472-4"
+       width="1.0625"
+       height="0.375"
+       x="121.78127"
+       y="902.17468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="900.17468"
+       x="124.06252"
+       height="0.375"
+       width="1.0625"
+       id="rect4474-3"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4476-1"
+       width="1.0625"
+       height="0.375"
+       x="124.25002"
+       y="898.70593" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="897.20593"
+       x="124.31252"
+       height="0.375"
+       width="1.0625"
+       id="rect4478-4"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4480-6"
+       width="1.0625"
+       height="0.375"
+       x="124.31252"
+       y="895.79968" />
+  </g>
+  <g
+     id="g1790"
+     transform="translate(0,22)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:connector-curvature="0"
+       id="rect4397-0"
+       d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       id="path4418-4"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="0.81812328"
+       rx="1.0135853"
+       y="861.57312"
+       x="236.7028"
+       height="1.6362466"
+       width="6.7246785"
+       id="rect4395-0"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+  </g>
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4709"
+     id="use1769"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4774"
+     id="use1771"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4778"
+     id="use1773"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4782"
+     id="use1775"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1783"
+     id="use1788"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1037"
+     id="use1795"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1790"
+     id="use1797"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+  <text
+     xml:space="preserve"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="6.5049949"
+     y="106.76174"
+     id="text1799"
+     transform="translate(4,-1)"><tspan
+       sodipodi:role="line"
+       id="tspan1801"
+       x="6.5049949"
+       y="106.76174"
+       style="fill:#ececec;fill-opacity:1">C</tspan></text>
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text1799"
+     id="use1803"
+     transform="translate(22,0)"
+     width="250"
+     height="200" />
+</svg>
diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png
index 2035681353..2ee1a5ecbb 100644
Binary files a/view/theme/dispy-dark/icons.png and b/view/theme/dispy-dark/icons.png differ
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index a7beb63fce..6ffd2b3795 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -1,4 +1,4 @@
-<nav>
+<nav id="pagenav">
 
 <span id="banner">$banner</span>
 
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 0c2fa61bb7..100748ac45 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -445,6 +445,8 @@ nav .nav-link {
 .icon, .hover, .focus, .pointer {
     cursor: pointer;
 }
+
+
 /* popup notifications */
 div.jGrowl div.notice {
     background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -1132,6 +1134,7 @@ width: 100%;
     display: inline;
 }
 
+
 /**
  * tabs
  */
@@ -1459,13 +1462,23 @@ width: 100%;
 .comment-edit-wrapper {
     border-top: 1px #aaa solid;
 }
+[class^="comment-edit-bb"] {
+	list-style: none;
+	display: none;
+	margin: -40px 0 5px 60px;
+	width: 75%;
+}
+[class^="comment-edit-bb"] > li {
+	display: inline-block;
+	margin: 0 10px 0 0;
+	visibility: none;
+}
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
     width: 20px;
     height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-    float: left;
     margin-left: 10px;
 }
 .my-comment-photo {
@@ -1545,6 +1558,10 @@ div[id$="wrapper"] {
 div[id$="wrapper"] br {
     clear: left;
 }
+[id$="-end"], [class$="end"] {
+	clear: both;
+	margin: 0 0 10px 0;
+}
 #advanced-profile-with {
     margin-left: 200px;
 }
@@ -1606,9 +1623,6 @@ div[id$="wrapper"] br {
     position: relative;
     float:left;
 }
-#photo-photo-end {
-    clear: both;
-}
 #photo-prev-link,
 #photo-next-link {
     position:absolute;
@@ -2706,6 +2720,71 @@ input[type="submit"]:active, input[type="button"]:active {
     border: 0;
     text-decoration: none;
 }
+.editicon {
+    display: inline-block;
+    width: 21px;
+    height: 21px;
+    background: url(editicons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
+}
+.shadow {
+	box-shadow: 2px 2px 5px 2px #111;
+}
+.shadow:active, .shadow:focus, .shadow:hover {
+	box-shadow: 0 0 0 0;
+}
+.editicon:hover {
+	border: 0;
+}
+.boldbb {
+	background-position: 0px 0px;
+}
+.boldbb:hover {
+	background-position: -22px 0px;
+}
+.italicbb {
+	background-position: 0px -22px;
+}
+.italicbb:hover {
+	background-position: -22px -22px;
+}
+.underlinebb {
+	background-position: 0px -44px;
+}
+.underlinebb:hover {
+	background-position: -22px -44px;
+}
+.quotebb {
+	background-position: 0px -66px;
+}
+.quotebb:hover {
+	background-position: -22px -66px;
+}
+.codebb {
+	background-position: 0px -88px;
+}
+.codebb:hover {
+	background-position: -22px -88px;
+}
+.imagebb {
+	background-position: -44px 0px;
+}
+.imagebb:hover {
+	background-position: -66px 0px;
+}
+.urlbb {
+	background-position: -44px -22px;
+}
+.urlbb:hover {
+	background-position: -66px -22px;
+}
+.videobb {
+	background-position: -44px -44px;
+}
+.videobb:hover {
+	background-position: -66px -44px;
+}
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
diff --git a/view/theme/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl
index 1b7dda8f85..a0298a7de9 100644
--- a/view/theme/dispy/bottom.tpl
+++ b/view/theme/dispy/bottom.tpl
@@ -1 +1,52 @@
 <script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+
+});
+function tautogrow(id) {
+	$("textarea#comment-edit-text-" + id).autogrow();
+};
+
+function insertFormatting(comment, BBcode, id) {
+	var tmpStr = $("#comment-edit-text-" + id).val();
+	if(tmpStr == comment) {
+		tmpStr = "";
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+	textarea = document.getElementById("comment-edit-text-" + id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url") {
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+		} else {
+			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+		}
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url") {
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
+			+ "http://" + textarea.value.substring(start, end)
+			+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+		} else {
+			textarea.value = textarea.value.substring(0, start)
+			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
+			+ textarea.value.substring(end, textarea.value.length);
+		}
+	}
+	return true;
+}
+
+function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+	$(".comment-edit-bb-" + id + "> li").css({visibility: 'visible'});
+	
+}
+function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+	$(".comment-edit-bb-" + id + "> li").css({visibility: 'none'});
+}
+</script>
diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl
index adf2772af0..371477c5b9 100644
--- a/view/theme/dispy/comment_item.tpl
+++ b/view/theme/dispy/comment_item.tpl
@@ -11,14 +11,49 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<ul class="comment-edit-bb-$id">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','b', $id);"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','i', $id);"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','u', $id);"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','quote', $id);"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','code', $id);"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','img', $id);"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','url', $id);"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('$comment','video', $id);"></a></li>
+				</ul>
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-$id"
+					class="comment-edit-text-empty"
+					name="body"
+					onfocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"
+					onblur="commentClose(this,$id);cmtBbClose($id);"
+					placeholder="Comment">$comment</textarea>
 				{{ if $qcomment }}
                 <div class="qcomment-wrapper">
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);">
+					<select id="qcomment-select-$id"
+						name="qcomment-$id"
+						class="qcomment"
+						onchange="qCommentInsert(this,$id);">
 					<option value=""></option>
-				{{ for $qcomment as $qc }}
+					{{ for $qcomment as $qc }}
 					<option value="$qc">$qc</option>
-				{{ endfor }}
+					{{ endfor }}
 					</select>
 				</div>
 				{{ endif }}
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php
index 729f9be2ad..c3e6c91196 100644
--- a/view/theme/dispy/default.php
+++ b/view/theme/dispy/default.php
@@ -10,6 +10,9 @@
 		<?php if(x($page, 'header')) echo $page['header']; ?>
 	</header>
 	<article id="articlemain">
+		<header id="articleheader">
+			<?php if(x($page, 'articleheader')) echo $page['articleheader']; ?>
+		</header>
 		<?php if(x($page,'nav')) echo $page['nav']; ?>
 		<aside id="asideleft">
 			<?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
@@ -17,7 +20,8 @@
 		</aside>
 		<section id="sectionmain">
 			<?php if(x($page,'content')) echo $page['content']; ?>
-			<footer id="section-footer"></footer>
+			<footer id="sectionfooter">
+			</footer>
 		</section>
 		<aside id="asidemain">
 			<?php if(x($page,'aside')) echo $page['aside']; ?>
@@ -27,6 +31,9 @@
 			<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
 			<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
 		</aside>
+		<footer id="articlefooter">
+			<?php if(x($page, 'articlefooter')) echo $page['articlefooter']; ?>
+		</footer>
 	</article>
 	<footer id="footer">
 		<?php if(x($page, 'footer')) echo $page['footer']; ?>
diff --git a/view/theme/dispy/editicons.png b/view/theme/dispy/editicons.png
new file mode 100644
index 0000000000..41eafbb156
Binary files /dev/null and b/view/theme/dispy/editicons.png differ
diff --git a/view/theme/dispy/editicons.svg b/view/theme/dispy/editicons.svg
new file mode 100644
index 0000000000..2691d24b40
--- /dev/null
+++ b/view/theme/dispy/editicons.svg
@@ -0,0 +1,725 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="250"
+   height="200"
+   contentStyleType="text/css"
+   contentScriptType="text/ecmascript"
+   sodipodi:docname="editicons.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   id="svg1"
+   inkscape:version="0.48+devel r"
+   inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/editicons.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <title
+     id="title4806">editicons</title>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#8a8a8a"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="0"
+     inkscape:zoom="2.6353376"
+     inkscape:cx="71.888976"
+     inkscape:cy="165.17294"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg1"
+     showgrid="false"
+     inkscape:window-width="1100"
+     inkscape:window-height="740"
+     inkscape:window-x="34"
+     inkscape:window-y="42"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="false"
+     width="0px"
+     height="0px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata1">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>editicons</dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:date>2012-04-20</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Simon L'nu</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li />
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>
+          <dc:title>DESCRIPTION</dc:title>
+        </dc:description>
+        <cc:license
+           rdf:resource="http://artlibre.org/licence/lal" />
+        <dc:language>en-CA</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://artlibre.org/licence/lal">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.43349891,-524.43349)" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4713"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,-66.847069)" />
+  <text
+     xml:space="preserve"
+     style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+     x="79.591835"
+     y="91.591835"
+     id="text4709"
+     transform="translate(-46.16293,-73.825339)"><tspan
+       sodipodi:role="line"
+       id="tspan4711"
+       x="79.591835"
+       y="91.591835"
+       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#e6e6e6;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold">B</tspan></text>
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4721"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,21.152934)" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4725"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,-66.847066)" />
+  <rect
+     transform="translate(-64.805152,-44.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4727"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4729"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,-22.84707)" />
+  <rect
+     transform="translate(-64.805152,-0.8470705)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4731"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4733"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-64.805152,21.15293)" />
+  <rect
+     transform="translate(1.194848,-66.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4735"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4737"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,-44.847066)" />
+  <rect
+     transform="translate(1.194848,-22.84707)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4739"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4741"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(1.194848,-0.8470705)" />
+  <rect
+     transform="translate(1.194848,21.15293)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4743"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4745"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,-66.847066)" />
+  <rect
+     transform="translate(-20.805152,-44.847066)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4747"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4749"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,-22.84707)" />
+  <rect
+     transform="translate(-20.805152,-0.84707)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4751"
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <rect
+     style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4753"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-20.805152,21.15293)" />
+  <rect
+     transform="translate(-42.805152,-44.847069)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4715"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="4.7811713"
+     y="28.940323"
+     id="text4774"
+     transform="translate(28.806399,11)"><tspan
+       sodipodi:role="line"
+       id="tspan4776"
+       x="4.7811713"
+       y="28.940323"
+       style="font-size:18px">I</tspan></text>
+  <rect
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1"
+     id="rect4717"
+     width="20"
+     height="20"
+     x="66.405151"
+     y="68.413567"
+     rx="3"
+     ry="3"
+     transform="translate(-42.805152,-22.847069)" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="6.4507866"
+     y="61.118362"
+     id="text4778"
+     transform="translate(27,1)"><tspan
+       sodipodi:role="line"
+       id="tspan4780"
+       x="6.4507866"
+       y="61.118362"
+       style="font-size:18px">U</tspan></text>
+  <rect
+     transform="translate(-42.805152,-0.8470699)"
+     ry="3"
+     rx="3"
+     y="68.413567"
+     x="66.405151"
+     height="20"
+     width="20"
+     id="rect4719"
+     style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="4.28688"
+     y="81.765083"
+     id="text4782"
+     transform="translate(29,0.7234271)"><tspan
+       sodipodi:role="line"
+       id="tspan4784"
+       x="4.28688"
+       y="81.765083"
+       style="font-size:18px">Q</tspan></text>
+  <g
+     id="g1783"
+     transform="translate(66.197715,-88)">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="2.9268293"
+       rx="2.9268293"
+       y="858.11218"
+       x="173.12502"
+       height="9"
+       width="14.5"
+       id="rect4387-8"
+       style="fill:#666666;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="translate(-168.97273,-762.7948)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       transform="matrix(1.1489362,0,0,1.1489362,-455.1097,-153.28349)"
+       d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z"
+       sodipodi:ry="2.71875"
+       sodipodi:rx="2.6875"
+       sodipodi:cy="220.26843"
+       sodipodi:cx="408.8125"
+       id="path4391-3"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="arc" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="1"
+       rx="1"
+       y="859.06403"
+       x="174.89275"
+       height="1.8561553"
+       width="3.5355339"
+       id="rect4290"
+       style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       transform="translate(-168.97273,-762.7948)" />
+  </g>
+  <g
+     transform="translate(-43.063391,-846.33726)"
+     id="g1037">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:nodetypes="csccccscc"
+       inkscape:connector-curvature="0"
+       id="rect4428-4"
+       d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:connector-curvature="0"
+       id="path4440-4"
+       d="m 124.78127,905.73727 -1.9375,-0.063"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4442-9"
+       d="m 117.59377,901.20597 6.4375,0"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="908.11218"
+       x="115.28126"
+       height="0.375"
+       width="1.0625"
+       id="rect4446-9"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4448-3"
+       width="1.0625"
+       height="0.375"
+       x="115.34376"
+       y="906.51843" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="904.89343"
+       x="115.50001"
+       height="0.375"
+       width="1.0625"
+       id="rect4450-6"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4452-0"
+       width="1.0625"
+       height="0.375"
+       x="115.81251"
+       y="903.42468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="902.17468"
+       x="116.21876"
+       height="0.375"
+       width="1.0625"
+       id="rect4454-5"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4456-0"
+       width="1.0625"
+       height="0.375"
+       x="118.50001"
+       y="900.17468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="898.70593"
+       x="118.68751"
+       height="0.375"
+       width="1.0625"
+       id="rect4458-2"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4460-9"
+       width="1.0625"
+       height="0.375"
+       x="118.75001"
+       y="897.20593" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="895.79968"
+       x="118.75001"
+       height="0.375"
+       width="1.0625"
+       id="rect4462-4"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4464-3"
+       width="1.0625"
+       height="0.375"
+       x="120.84376"
+       y="908.11218" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="906.51843"
+       x="120.90627"
+       height="0.375"
+       width="1.0625"
+       id="rect4466-5"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4468-1"
+       width="1.0625"
+       height="0.375"
+       x="121.06252"
+       y="904.89343" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="903.42468"
+       x="121.37502"
+       height="0.375"
+       width="1.0625"
+       id="rect4470-7"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4472-4"
+       width="1.0625"
+       height="0.375"
+       x="121.78127"
+       y="902.17468" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="900.17468"
+       x="124.06252"
+       height="0.375"
+       width="1.0625"
+       id="rect4474-3"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4476-1"
+       width="1.0625"
+       height="0.375"
+       x="124.25002"
+       y="898.70593" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       y="897.20593"
+       x="124.31252"
+       height="0.375"
+       width="1.0625"
+       id="rect4478-4"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4480-6"
+       width="1.0625"
+       height="0.375"
+       x="124.31252"
+       y="895.79968" />
+  </g>
+  <g
+     id="g1790"
+     transform="translate(22,22)">
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       inkscape:connector-curvature="0"
+       id="rect4397-0"
+       d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
+       id="path4418-4"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
+       ry="0.81812328"
+       rx="1.0135853"
+       y="861.57312"
+       x="236.7028"
+       height="1.6362466"
+       width="6.7246785"
+       id="rect4395-0"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" />
+  </g>
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4709"
+     id="use1769"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4774"
+     id="use1771"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4778"
+     id="use1773"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text4782"
+     id="use1775"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1783"
+     id="use1788"
+     width="250"
+     height="200"
+     transform="translate(-22,0)" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1037"
+     id="use1795"
+     width="250"
+     height="200"
+     transform="translate(-22,0)" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#g1790"
+     id="use1797"
+     width="250"
+     height="200"
+     transform="translate(-22,0)" />
+  <text
+     xml:space="preserve"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold"
+     x="6.5049949"
+     y="106.76174"
+     id="text1799"
+     transform="translate(26,-1)"><tspan
+       sodipodi:role="line"
+       id="tspan1801"
+       x="6.5049949"
+       y="106.76174"
+       style="fill:#ececec;fill-opacity:1">C</tspan></text>
+  <use
+     x="0"
+     y="0"
+     xlink:href="#text1799"
+     id="use1803"
+     transform="translate(-22,0)"
+     width="250"
+     height="200" />
+</svg>
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
index f42330d650..5c2eab36e4 100644
Binary files a/view/theme/dispy/icons.png and b/view/theme/dispy/icons.png differ
diff --git a/view/theme/dispy/icons/email.png b/view/theme/dispy/icons/email.png
index b9d64cb931..349f5a91e4 100644
Binary files a/view/theme/dispy/icons/email.png and b/view/theme/dispy/icons/email.png differ
diff --git a/view/theme/dispy/icons/facebook.png b/view/theme/dispy/icons/facebook.png
index ff5129f947..be04f2b529 100644
Binary files a/view/theme/dispy/icons/facebook.png and b/view/theme/dispy/icons/facebook.png differ
diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png
index d0ae6face9..0d25e01b82 100644
Binary files a/view/theme/dispy/icons/posterous.png and b/view/theme/dispy/icons/posterous.png differ
diff --git a/view/theme/dispy/icons/tumblr.png b/view/theme/dispy/icons/tumblr.png
index 9d5fcd045b..054cd119d9 100644
Binary files a/view/theme/dispy/icons/tumblr.png and b/view/theme/dispy/icons/tumblr.png differ
diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png
index 6a4e36d458..4ee872b749 100644
Binary files a/view/theme/dispy/icons/wordpress.png and b/view/theme/dispy/icons/wordpress.png differ
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index a7beb63fce..6ffd2b3795 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -1,4 +1,4 @@
-<nav>
+<nav id="pagenav">
 
 <span id="banner">$banner</span>
 
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 5552f0b43a..9af91bba66 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -446,6 +446,8 @@ nav .nav-link {
 .icon, .hover, .focus, .pointer {
     cursor: pointer;
 }
+
+
 /* popup notifications */
 div.jGrowl div.notice {
     background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -1133,6 +1135,7 @@ width: 100%;
     display: inline;
 }
 
+
 /**
  * tabs
  */
@@ -1460,13 +1463,23 @@ width: 100%;
 .comment-edit-wrapper {
     border-top: 1px #aaa solid;
 }
+[class^="comment-edit-bb"] {
+	list-style: none;
+	display: none;
+	margin: -40px 0 5px 60px;
+	width: 75%;
+}
+[class^="comment-edit-bb"] > li {
+	display: inline-block;
+	margin: 0 10px 0 0;
+	visibility: none;
+}
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
     width: 20px;
     height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-    float: left;
     margin-left: 10px;
 }
 .my-comment-photo {
@@ -1546,6 +1559,10 @@ div[id$="wrapper"] {
 div[id$="wrapper"] br {
     clear: left;
 }
+[id$="-end"], [class$="end"] {
+	clear: both;
+	margin: 0 0 10px 0;
+}
 #advanced-profile-with {
     margin-left: 200px;
 }
@@ -1607,9 +1624,6 @@ div[id$="wrapper"] br {
     position: relative;
     float:left;
 }
-#photo-photo-end {
-    clear: both;
-}
 #photo-prev-link,
 #photo-next-link {
     position:absolute;
@@ -2277,7 +2291,7 @@ div[id$="wrapper"] br {
 .item-select {
     opacity: 0.1;
     filter:alpha(opacity=10);
-    margin-right: 5px 0 0 6px !important;
+    margin: 5px 0 0 6px !important;
 }
 .item-select:hover, .checkeditem {
     opacity: 1;
@@ -2707,6 +2721,71 @@ input[type="submit"]:active, input[type="button"]:active {
     border: 0;
     text-decoration: none;
 }
+.editicon {
+    display: inline-block;
+    width: 21px;
+    height: 21px;
+    background: url(editicons.png) no-repeat;
+    border: 0;
+    text-decoration: none;
+}
+.shadow {
+	box-shadow: 2px 2px 5px 2px #111;
+}
+.shadow:active, .shadow:focus, .shadow:hover {
+	box-shadow: 0 0 0 0;
+}
+.editicon:hover {
+	border: 0;
+}
+.boldbb {
+	background-position: 0px 0px;
+}
+.boldbb:hover {
+	background-position: -22px 0px;
+}
+.italicbb {
+	background-position: 0px -22px;
+}
+.italicbb:hover {
+	background-position: -22px -22px;
+}
+.underlinebb {
+	background-position: 0px -44px;
+}
+.underlinebb:hover {
+	background-position: -22px -44px;
+}
+.quotebb {
+	background-position: 0px -66px;
+}
+.quotebb:hover {
+	background-position: -22px -66px;
+}
+.codebb {
+	background-position: 0px -88px;
+}
+.codebb:hover {
+	background-position: -22px -88px;
+}
+.imagebb {
+	background-position: -44px 0px;
+}
+.imagebb:hover {
+	background-position: -66px 0px;
+}
+.urlbb {
+	background-position: -44px -22px;
+}
+.urlbb:hover {
+	background-position: -66px -22px;
+}
+.videobb {
+	background-position: -44px -44px;
+}
+.videobb:hover {
+	background-position: -66px -44px;
+}
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;