diff --git a/view/theme/smoothly/comment_item.tpl b/view/theme/smoothly/comment_item.tpl
deleted file mode 100755
index f64ae753b6..0000000000
--- a/view/theme/smoothly/comment_item.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			{{ if $threaded }}
-			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-			{{ else }}
-			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-			{{ endif }}
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<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>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						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);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/smoothly/follow.tpl b/view/theme/smoothly/follow.tpl
new file mode 100644
index 0000000000..9c8a6bf3f2
--- /dev/null
+++ b/view/theme/smoothly/follow.tpl
@@ -0,0 +1,8 @@
+<div id="follow-sidebar" class="widget">
+	<h3>$connect</h3>
+	<div id="connect-desc">$desc</div>
+	<form action="follow" method="post" />
+		<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
+	</form>
+</div>
+
diff --git a/view/theme/smoothly/moderated_comment.tpl b/view/theme/smoothly/moderated_comment.tpl
deleted file mode 100755
index b0451c8c60..0000000000
--- a/view/theme/smoothly/moderated_comment.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<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>
-				<div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
-					<div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
-					<input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
-					<div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
-					<input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
-					<div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
-					<input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
-				</div>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						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);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/smoothly/peoplefind.tpl b/view/theme/smoothly/peoplefind.tpl
new file mode 100644
index 0000000000..106abdb1ec
--- /dev/null
+++ b/view/theme/smoothly/peoplefind.tpl
@@ -0,0 +1,14 @@
+<div id="peoplefind-sidebar" class="widget">
+	<h3>$findpeople</h3>
+	<div id="peoplefind-desc">$desc</div>
+	<form action="dirfind" method="post" />
+		<input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
+	</form>
+	<div class="side-link" id="side-match-link"><a href="match" >$similar</a></div>
+	<div class="side-link" id="side-suggest-link"><a href="suggest" >$suggest</a></div>
+	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >$random</a></div>
+	{{ if $inv }} 
+	<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
+	{{ endif }}
+</div>
+
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 9667eaf1d0..541a86a893 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -88,8 +88,19 @@ input[type=text] {
 	border-radius: 3px 3px 3px 3px;	
 }
 
+input[type=text-sidebar] {
+	border: 1px solid #b0b0b0;
+	padding: 2px;
+	width: 172px;
+	margin-left: 10px;
+	margin-top: 10px;
+	-webkit-border-radius: 3px 3px 3px 3px;
+	-moz-border-radius: 3px 3px 3px 3px;
+	border-radius: 3px 3px 3px 3px;	
+}
+
 input[type=submit] {
-	margin: 0px 0px 5px 2px;
+	margin: 10px;
 	border: none;
 	font-size: 0.9em;
 	padding: 5px;
@@ -127,7 +138,7 @@ input[type=submit]:active {
 
 section {
 	float: left;
-	padding-top: 60px;
+	padding-top: 40px; /*60*/
 	width: 730px;
 	font-size: 0.9em;
 	line-height: 1.2em;
@@ -277,10 +288,10 @@ nav {
 	padding: 0;
 	width: 960px;
 	z-index: 10000;
-	height: 50px;
+	height: 40px;
 	position: fixed;
 	color: #efefef;
-	background: url("nav-bg.png") no-repeat scroll 0px 7px transparent;
+	background: url("nav-bg.png") no-repeat scroll 0px 0px transparent;
 	/*background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );*/
 	/*background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );*/
 	/*filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');*/
@@ -295,7 +306,7 @@ nav #banner {
 	display: block;
 	position: absolute;
 	margin-left: 3px; /*10*/
-	margin-top: 10px; /*5*/
+	margin-top: 3px; /*5*/
 	padding-bottom:5px;	
 }
 nav #banner #logo-text a {
@@ -309,7 +320,7 @@ nav #user-menu {
 	width: 190px; /*240*/
 	float: right;
 	margin-right: 5px; /*20%*/
-	margin-top: 11px;
+	margin-top: 3px;
 	padding: 5px;
 	position: relative;
 	vertical-align: middle;
@@ -376,7 +387,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 #notifications {
 	height: 32px;
 	position: absolute;
-	top:10px; left: 35%;
+	top:3px; left: 35%;
 }
 .nav-ajax-update {
 	width: 44px;
@@ -390,7 +401,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 	padding-left: 11px;
 }
 #notify-update { background-position: 0px -168px; }
-#net-update { background-position: 0px -126px }
+#net-update { background-position: 0px -126px; }
 #mail-update { background-position: 0px -40px; }
 #intro-update { background-position: 0px -84px; }
 #home-update { background-position: 0px 0px; }
@@ -550,11 +561,11 @@ aside h4 { font-size: 1.3em; }
 	padding: 5px 5px 5px 5px;
 }
 #netsearch-box input[type="text"] {
-	width: 175px;
+	width: 97%;
 }
 #netsearch-box input[type="submit"] {
-	width: 48%;
-	margin-top: 5px;
+	width: auto;
+	/*margin-top: 5px;*/
 }
 
 h3#search:before {
@@ -909,10 +920,9 @@ profile-jot-banner-wrapper {
 .tabs {
 	min-width: 400px;
 	list-style: none;
-	padding: 0px; /*10*/
+	padding: 20px 0px 0px;
 	/*border-bottom: 1px solid #efefef;*/
 	font-size: 0.9em;
-	margin-top: 0px;
 }
 .tabs li { display: inline;}
 
@@ -1162,7 +1172,7 @@ profile-jot-banner-wrapper {
 }
 
 .icon.drop,
-.icon.drophide { float: left;}
+.icon.drophide { float: right;}
 #item-delete-selected {	overflow: auto;	width: 100%;}
 
 
@@ -1254,6 +1264,7 @@ profile-jot-banner-wrapper {
 
 #item-delete-selected-desc {
 	color: #898989;
+	float: right;
 }
 
 .wall-item-body code {
@@ -1305,7 +1316,7 @@ div[id$="wrapper"] br { clear: left; }
 #profile-listing-new-link-wrapper {
 	float: left;
 	display: inline;
-	width: 130px;
+	width: auto;
 	margin-left:5px;
 	margin-top: 20px;
 	padding: 5px 10px 5px 10px;
@@ -1779,7 +1790,7 @@ margin-left: 0px;
 
 .mail-list-detail {
 	margin-left: 100px;
-	width: 300px;
+	width: 600px;
 	min-height: 70px;
 	padding: 20px;
 	padding-top:10px;
@@ -1820,6 +1831,7 @@ margin-left: 0px;
 
 .mail-conv-outside-wrapper {
 	margin-bottom: 10px;
+	margin-top: 30px;
 }
 
 .mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
@@ -1837,8 +1849,8 @@ margin-left: 0px;
 
 .mail-conv-detail {
 	width: 500px;
-	padding: 30px;
-	padding-bottom: 10px;
+	padding: 20px;
+	padding-bottom: 20px;
 	margin-left: 20px;
 	margin-bottom: 0px;
 	vertical-align: middle;
@@ -2048,14 +2060,16 @@ margin-left: 0px;
 }
 
 #side-follow-submit {
-	width: 70px;
+	width: 178px;
+	margin: 10px;
+	text-align: center;
 }
 
 #side-match-link {
-	width: 180px;
+	width: 158px;
 	padding: 10px;
-	margin: auto;
-	margin-bottom: 20px;
+	margin: auto 10px 20px;
+	/*margin-bottom: 20px;*/
 	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
@@ -2068,7 +2082,7 @@ margin-left: 0px;
 	border-radius:5px;
 	padding: 5px 10px 5px 10px;
 	color: #efefef;
-	font-size: 1.2em;
+	font-size: 1.1em;
 	text-align: center;
 }
 
@@ -2091,7 +2105,7 @@ margin-left: 0px;
 }
 
 #side-invite-link {
-	width: 180px;
+	width: 80%;
 	padding: 10px;
 	margin: auto;
 	margin-bottom: 20px;
@@ -2107,7 +2121,7 @@ margin-left: 0px;
 	border-radius:5px;
 	padding: 5px 10px 5px 10px;
 	color: #efefef;
-	font-size: 1.2em;
+	font-size: 1.1em;
 	text-align: center;	
 }
 
@@ -2131,7 +2145,7 @@ margin-left: 0px;
 }
 
 #side-suggest-link {
-	width: 180px;
+	width: 80%;
 	padding: 10px;
 	margin: auto;
 	margin-bottom: 20px;
@@ -2147,7 +2161,7 @@ margin-left: 0px;
 	border-radius:5px;
 	padding: 5px 10px 5px 10px;
 	color: #efefef;
-	font-size: 1.2em;
+	font-size: 1.1em;
 	text-align: center;	
 }
 
@@ -2309,14 +2323,16 @@ margin-left: 0px;
 }
 
 #settings-default-perms {
-	width: 160px;
+	width: 260px;
 	text-align: center;
 	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
 	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );
-	background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );
+	/*background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );*/
+	background: -moz-linear-gradient(center top , #BDBDBD 5%, #A2A2A2 100%) repeat scroll 0 0 #BDBDBD;
 	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');
+	color: #EFEFEF;
 	background-color:#7c7d7b;
 	-moz-border-radius:5px;
 	-webkit-border-radius:5px;
@@ -2774,7 +2790,7 @@ tr {
 	list-style-position: inside;
 	font-size: 1em;
 	padding: 5px;
-	width: 100px;
+	width: auto;
 	margin: 5px;
 }
 
@@ -2834,7 +2850,8 @@ tr {
 /* =============== */
 
 .field {
-	margin-bottom: 5px;
+	margin-bottom: 10px;
+	margin-top: 10px;
 	padding-bottom: 0px;
 	/*overflow: auto;*/
 	width: 90%;