diff --git a/ren2.PNG b/ren2.PNG
new file mode 100644
index 00000000..380d3271
Binary files /dev/null and b/ren2.PNG differ
diff --git a/ren3.PNG b/ren3.PNG
new file mode 100644
index 00000000..c55750ad
Binary files /dev/null and b/ren3.PNG differ
diff --git a/src/data.sql b/src/data.sql
index f31c9673..8ae6d86c 100644
--- a/src/data.sql
+++ b/src/data.sql
@@ -26,6 +26,7 @@ CREATE TABLE `topics`(
 	`tid` int not null AUTO_INCREMENT,
 	`title` varchar(100) not null,
 	`content` text not null,
+	`parsed_content` text not null,
 	`createdAt` datetime not null,
 	`lastReplyAt` datetime not null,
 	`createdBy` int not null,
@@ -39,6 +40,7 @@ CREATE TABLE `replies`(
 	`rid` int not null AUTO_INCREMENT,
 	`tid` int not null,
 	`content` text not null,
+	`parsed_content` text not null,
 	`createdAt` datetime not null,
 	`createdBy` int not null,
 	`lastEdit` int not null,
diff --git a/src/templates/account-own-edit-avatar-success.html b/src/templates/account-own-edit-avatar-success.html
index 23ed7217..c6d333cc 100644
--- a/src/templates/account-own-edit-avatar-success.html
+++ b/src/templates/account-own-edit-avatar-success.html
@@ -2,8 +2,8 @@
 <div class="alert_success">Your data was successfully updated</div>
 <div class="colblock_left">
 	<div class="rowitem"><a>My Account</a></div>
-	<div class="rowitem passive"><a href="/user/edit/critical/">Edit Password</a></div>
 	<div class="rowitem passive"><a href="/user/edit/avatar/">Edit Avatar</a></div>
+	<div class="rowitem passive"><a href="/user/edit/critical/">Edit Password</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
diff --git a/src/templates/account-own-edit-success.html b/src/templates/account-own-edit-success.html
index ddce8e93..607e22d4 100644
--- a/src/templates/account-own-edit-success.html
+++ b/src/templates/account-own-edit-success.html
@@ -2,8 +2,8 @@
 <div class="alert_success">Your data was successfully updated</div>
 <div class="colblock_left">
 	<div class="rowitem"><a>My Account</a></div>
-	<div class="rowitem passive"><a href="/user/edit/critical/">Edit Password</a></div>
 	<div class="rowitem passive"><a href="/user/edit/avatar/">Edit Avatar</a></div>
+	<div class="rowitem passive"><a href="/user/edit/critical/">Edit Password</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
diff --git a/src/templates/account-own-edit.html b/src/templates/account-own-edit.html
index 9e901f2e..6c87a01f 100644
--- a/src/templates/account-own-edit.html
+++ b/src/templates/account-own-edit.html
@@ -1,8 +1,8 @@
 {{template "header.html" . }}
 <div class="colblock_left">
 	<div class="rowitem"><a>My Account</a></div>
-	<div class="rowitem passive"><a href="/user/edit/critical/">Edit Password</a></div>
 	<div class="rowitem passive"><a href="/user/edit/avatar/">Edit Avatar</a></div>
+	<div class="rowitem passive"><a href="/user/edit/critical/">Edit Password</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
 	<div class="rowitem passive"><a>Coming Soon</a></div>
diff --git a/src/topic.go b/src/topic.go
index 08c0383f..a88974dc 100644
--- a/src/topic.go
+++ b/src/topic.go
@@ -13,3 +13,18 @@ type Topic struct
 	Status string
 }
 
+type TopicUser struct
+{
+	ID int
+	Title string
+	Content interface{}
+	CreatedBy int
+	Is_Closed bool
+	Sticky bool
+	CreatedAt string
+	ParentID int
+	Status string
+	
+	CreatedByName string
+	Avatar string
+}