6 files changed, 97 insertions, 20 deletions
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
new file mode 100644
index 000000000..a786e47b7
--- /dev/null
+++ b/view/contact_edit.tpl
@@ -0,0 +1,34 @@
+
+
+<div id="contact-edit-wrapper" >
+	<div class="contact-edit-photo-wrapper" >
+		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
+		<div id="contact-edit-photo" >
+			<a href="$url" title="Visit $name's profile" /><img src="$photo" alt="$name" /></a>
+		</div>
+		<div id="contact-edit-photo-end" ></div>
+	</div>
+	<div id="contact-edit-nav-wrapper"
+		<div id="contact-edit-name" >$name</div>
+
+		<div id="contact-edit-break"></div>
+
+<form action="contacts" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
+		<div id="contact-edit-links" >
+			<a href="contacts/$id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="Block contact" title="Block contact"/></a>
+			<a href="contacts/$id/drop" id="contact-edit-drop-link"><img src="images/b_drop.gif" alt="Delete contact" title="Delete contact"/></a>
+		</div>
+		<div id="contact-edit-nav-end"></div>
+	</div>
+	<div class="contact-dit-end" ></div>
+$profile_select
+
+$groups
+
+$rating
+
+$reason
+</form>
+</div>
diff --git a/view/contact_selectors.php b/view/contact_selectors.php
index 186a50e7a..a7d3d0f5b 100644
--- a/view/contact_selectors.php
+++ b/view/contact_selectors.php
@@ -1,12 +1,12 @@
 <?php
 
 
-function select_contact_profile($current) {
+function contact_profile_assign($current) {
 
 	$o = '';
-	$o .= "<select id=\"contact_profile_selector\" name=\"profile_id\" />";
+	$o .= "<select id=\"contact_profile_selector\" name=\"profile_assign\" />";
 
-	$r = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
+	$r = q("SELECT `profile-name` FROM `profile` WHERE `uid` = %d",
                         intval($_SESSION['uid']));
 
 	if(count($r)) {
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index bfa901734..7481bdc70 100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,17 +1,23 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
-<img class="contact-entry-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
-<div class="contact-entry-photo" id="contact-entry-photo-$id" >
-	<a href="$url" title="Visit $name's profile" /><img src="$thumb" alt="$name" ></a>
-</div>
-<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
-</div>
-<div class="contact-entry-edit-links" >
-<a href="contacts/$id/edit" class="contact-entry-edit-link" ><img src="images/b_edit.gif" alt="Edit contact" title="Edit contact" /></a>
-<a href="contacts/$id/block" class="contact-edit-block-link" ><img src="images/b_block.gif" alt="Block contact" title="Block contact"/></a>
-<a href="contacts/$id/drop" class="contact-entry-block-link"><img src="images/b_drop.gif" alt="Delete contact" title="Delete contact"/></a>
-</div>
-<div class="contact-entry-end" ></div>
+	<div class="contact-entry-photo-wrapper" >
+		<img class="contact-entry-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
+		<div class="contact-entry-photo" id="contact-entry-photo-$id" >
+			<a href="$url" title="Visit $name's profile" /><img src="$thumb" alt="$name" /></a>
+		</div>
+		<div class="contact-entry-photo-end" ></div>
+	</div>
+	<div class="contact-entry-nav-wrapper"
+		<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
 
+		<div class="contact-entry-break"></div>
+
+		<div class="contact-entry-edit-links" >
+			<a href="contacts/$id" class="contact-entry-edit-link" ><img src="images/b_edit.gif" alt="Edit contact" title="Edit contact" /></a>
+		</div>
+		<div class="contact-entry-nav-end"></div>
+	</div>
+	<div class="contact-entry-end" ></div>
+</div>
 
 <hr />
 \ No newline at end of file
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 72cc672ff..23e798ecd 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -5,7 +5,8 @@
 
 tinyMCE.init({
 	theme : "advanced",
-	mode : "textareas",
+	mode : "specific_textareas",
+	editor_selector: "profile-jot-text",
 	plugins : "bbcode",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
 	theme_advanced_buttons2 : "",
diff --git a/view/jot.tpl b/view/jot.tpl
index 8be7865b6..b6599feec 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -7,7 +7,7 @@ What's on your mind?
 <input type="hidden" name="type" value="jot" />
 <input type="hidden" name="profile_uid" value="$profile_uid" />
 
-<textarea rows="5" cols="64" id="profile-jot-text" name="body" ></textarea>
+<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
 </div>
 <div id="profile-jot-submit-wrapper" >
diff --git a/view/style.css b/view/style.css
index f12e5f789..7114f4394 100644
--- a/view/style.css
+++ b/view/style.css
@@ -340,15 +340,49 @@ input#dfrn-url {
 	float: left;
 }
 
-
+#contacts-main {
+	margin-bottom: 20px;
+}
+.contact-entry-photo-wrapper {
+	float: left;
+}
+.contact-entry-direction-icon {
+	margin-top: 24px;
+	float: left;
+}
 .contact-entry-photo img {
 	border: none;
 }
-
+.contact-entry-photo-end {
+	clear: both;
+}
+.contact-entry-edit-links {
+	float: left;
+	margin-top: 10px;
+}
+.contact-entry-name {
+	float: left;
+}
+.contact-entry-nav-wrapper {
+	float: left;
+	margin-left: 10px;
+}
+.contact-entry-nav-end {
+	clear: both;
+}
+.contact-entry-break {
+	clear: both;
+}
 .contact-entry-edit-links img {
 	border: none;
 	margin-right: 15px;
 }
+.contact-entry-photo {
+	float: left;
+}
+.contact-entry-end {
+	clear: both;
+}
 
 .wall-item-photo-wrapper {
 	margin-top: 20px;
@@ -399,9 +433,11 @@ input#dfrn-url {
 #profile-listing-new-link-wrapper {
 	margin-bottom: 30px;
 }
+.profile-listing-photo-wrapper {
+	float: left;
+}
 
 .profile-listing-edit-buttons-wrapper {
-/*	float: left;*/
 	clear: both;
 }
 .profile-listing-photo-edit-link {