diff --git a/controller/category.php b/controller/category.php
index 74815d1..b889c33 100644
--- a/controller/category.php
+++ b/controller/category.php
@@ -52,7 +52,7 @@ public function cat()
 		$kb_config = $this->kb->obtain_kb_config();
 		$per_page = $kb_config['articles_per_page'];
 
-		$sql = 'SELECT category_id
+		$sql = 'SELECT category_id, category_name
 			FROM '. KB_CAT_TABLE .'
 			WHERE category_id = '.$cat_id.'';
 		$result = $this->db->sql_query($sql);
@@ -64,6 +64,8 @@ public function cat()
 			trigger_error ('CAT_NO_EXISTS');
 		}
 
+		$this->template->assign_block_vars('par_cat_row', array( 'PAR_CAT_NAME' => $row['category_name']) );
+
 		$sql = 'SELECT COUNT(article_id) as article_count
 			FROM '. ARTICLES_TABLE .'
 			WHERE article_category_id = '.$cat_id.'
@@ -113,6 +115,7 @@ public function cat()
 			$this->template->assign_block_vars('cat_row', array(
 				'CAT_ID'	=> $cat_row['category_id'],
 				'CAT_NAME'	=> $cat_row['category_name'],
+				'CAT_DESCRIPTION' => $cat_row['category_details'],
 				'U_CAT'		=> append_sid("{$this->phpbb_root_path}knowlegebase/category", "id=$cat_row[category_id]"),
 				'ARTICLES'	=> $cat_row['number_articles'],
 				'SUBCATS'	=> $this->kb->get_cat_list ($cat_row['parent_id'], $exclude_cats),
diff --git a/controller/edit.php b/controller/edit.php
index 360a690..1f2ae10 100644
--- a/controller/edit.php
+++ b/controller/edit.php
@@ -172,6 +172,11 @@ public function edit_article()
 			}
 		}
 
+		if ($cancel)
+		{
+			redirect(append_sid("{$this->phpbb_root_path}knowlegebase/category",'id=' . $cat_id . ''));
+		}
+
 		if ($submit and !sizeof($error))
 		{
 			$uid = $bitfield = $options = '';
diff --git a/inc/functions_kb.php b/inc/functions_kb.php
index 1f2bd4b..84e53f1 100644
--- a/inc/functions_kb.php
+++ b/inc/functions_kb.php
@@ -261,7 +261,8 @@ public function get_cat_info($category_id)
 	{
 		$sql = 'SELECT *
 			FROM ' . KB_CAT_TABLE . "
-			WHERE category_id = $category_id";
+			WHERE category_id = $category_id" . '
+			ORDER BY left_id ASC';
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
diff --git a/styles/prosilver/template/kb_cat_body.html b/styles/prosilver/template/kb_cat_body.html
index caa8724..26b0bc1 100644
--- a/styles/prosilver/template/kb_cat_body.html
+++ b/styles/prosilver/template/kb_cat_body.html
@@ -10,8 +10,10 @@ <h2>
 			<ul class="topiclist">
 				<li class="header">
 					<dl class="icon">
-						<dt>{L_CATEGORY}</dt>
+				<!-- BEGIN par_cat_row -->
+						<dt>{L_CATEGORY}<!-- IF par_cat_row.PAR_CAT_NAME --> - {par_cat_row.PAR_CAT_NAME}<!-- ENDIF --></dt>
 						<dd class="icons">{L_ARTICLES}</dd>
+				<!-- END par_cat_row -->
 					</dl>
 				</li>
 			</ul>
@@ -20,9 +22,11 @@ <h2>
 				<li class="row">
 					<dl>
 						<dt style="padding-left: 5px;">
+						<div class="list-inner">
 							<a href="{cat_row.U_CAT}" class="forumtitle">{cat_row.CAT_NAME}</a>
-							<!-- IF cat_row.CAT_DESCRIPTION --><br />{cat_row.CAT_DESCRIPTION}<!-- ENDIF -->
+							<!-- IF cat_row.CAT_DESCRIPTION --><br /><span>{cat_row.CAT_DESCRIPTION}</span><!-- ENDIF -->
 							<!-- IF cat_row.SUBCATS --><br /><span>{cat_row.SUBCATS}</span><!-- ENDIF -->
+						</div>
 						</dt>
 							<dd class="topics">{cat_row.ARTICLES}</dd>
 					</dl>
@@ -79,7 +83,7 @@ <h2>
 				<tbody>
 				<!-- BEGIN art_row -->
 				<tr class="bg1">
-					<td class="name">{art_row.ARTICLE}<!-- IF not art_row.S_APPROVED --><ul class="post-buttons" style="float: left; margin-top: -4px; margin-right: 4px;"><li><span style="cursor:default" title="{L_NEED_APPROOVE}" class="button icon-button info-icon"><span>{L_NEED_APPROOVE}</span></span></li></ul>
+					<td class="name">{art_row.ARTICLE}<br />{art_row.ARTICLE_DESCRIPTION}<!-- IF not art_row.S_APPROVED --><ul class="post-buttons" style="float: left; margin-top: -4px; margin-right: 4px;"><li><span style="cursor:default" title="{L_NEED_APPROOVE}" class="button icon-button info-icon"><span>{L_NEED_APPROOVE}</span></span></li></ul>
 					</a><!-- ENDIF --></td>
 					<td class="wievs">{art_row.ARTICLE_AUTHOR}</td>
 					<td class="joned">{art_row.ARTICLE_DATE}</td>
diff --git a/styles/prosilver/template/kb_post_body.html b/styles/prosilver/template/kb_post_body.html
index 786d0cc..76fa9b0 100644
--- a/styles/prosilver/template/kb_post_body.html
+++ b/styles/prosilver/template/kb_post_body.html
@@ -31,7 +31,7 @@ <h3>{L_POST_A}</h3>
 				</dl>
 				<dl style="clear: left;">
 					<dt><label for="subject">{L_DESCR}:</label></dt>
-					<dd><input type="text" name="descr" id="subject" size="60" maxlength="60" tabindex="2" value="{DESCR}" class="inputbox autowidth" /></dd>
+					<dd><input type="text" name="descr" id="subject" size="60" maxlength="254" tabindex="2" value="{DESCR}" class="inputbox autowidth" /></dd>
 				</dl>
 			<!-- INCLUDE posting_buttons.html -->
 				<div id="smiley-box">