diff --git a/engine/lib/internal/template/js/wall.js b/engine/lib/internal/template/js/wall.js
index fe3562e9..d803f76b 100644
--- a/engine/lib/internal/template/js/wall.js
+++ b/engine/lib/internal/template/js/wall.js
@@ -21,6 +21,7 @@ ls.wall = (function ($) {
 			if (result.bStateError) {
 				ls.msg.error(null, result.sMsg);
 			} else {
+				$('.js-wall-reply-parent-text').val('');
 				this.loadNew();
 				ls.hook.run('ls_wall_add_after',[sText, iPid, result]);
 			}
@@ -28,18 +29,17 @@ ls.wall = (function ($) {
 		return false;
 	};
 
-	this.addReply = function(sText) {
+	this.addReply = function(sText, iPid) {
 		var url = aRouter['profile']+this.options.login+'/wall/add/';
-		var params = {sText: sText, iPid: this.iIdForReply};
+		var params = {sText: sText, iPid: iPid};
 		'*addReplyBefore*'; '*/addReplyBefore*';
 		ls.ajax(url, params, function(result) {
 			if (result.bStateError) {
 				ls.msg.error(null, result.sMsg);
 			} else {
-				$('#wall-reply-text').val('');
-				$('#wall-reply-form').hide();
-				this.loadReplyNew(this.iIdForReply);
-				ls.hook.run('ls_wall_addreply_after',[sText, this.iIdForReply, result]);
+				$('.js-wall-reply-text').val('');
+				this.loadReplyNew(iPid);
+				ls.hook.run('ls_wall_addreply_after',[sText, iPid, result]);
 			}
 		}.bind(this));
 		return false;
@@ -154,14 +154,12 @@ ls.wall = (function ($) {
 	};
 
 	this.toggleReply = function(iId) {
-		var reply=$('#wall-reply-form');
-		if (iId==this.iIdForReply) {
-			reply.toggle();
-		} else {
-			reply.insertAfter($('#wall-button-reply-'+iId));
-			reply.show();
-			this.iIdForReply=iId;
-		}
+		$('#wall-item-' + iId + ' .wall-submit-reply').toggle();
+		return false;
+	};
+
+	this.expandReply = function(iId) {
+		$('#wall-item-' + iId + ' .wall-submit-reply').addClass('active');
 		return false;
 	};
 
@@ -172,4 +170,15 @@ ls.wall = (function ($) {
 	};
 
 	return this;
-}).call(ls.wall || {},jQuery);
\ No newline at end of file
+}).call(ls.wall || {},jQuery);
+
+
+jQuery(document).ready(function($){
+	$(document).click(function() {
+		$('.wall-submit-reply.active').removeClass('active');
+	});
+	
+	$('body').on("click", ".wall-submit-reply", function(e) { 
+		e.stopPropagation();
+	});
+});
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/actions/ActionProfile/wall.tpl b/templates/skin/developer-jquery/actions/ActionProfile/wall.tpl
index e0c53f0e..62de9be9 100644
--- a/templates/skin/developer-jquery/actions/ActionProfile/wall.tpl
+++ b/templates/skin/developer-jquery/actions/ActionProfile/wall.tpl
@@ -19,7 +19,7 @@
 
 <form class="wall-submit">
 	<label for="wall-text">Написать на стене:</label>
-	<p><textarea rows="4" id="wall-text" class="input-text input-width-full"></textarea></p>
+	<p><textarea rows="4" id="wall-text" class="input-text input-width-full js-wall-reply-parent-text"></textarea></p>
 
 	<button type="button" onclick="ls.wall.add(jQuery('#wall-text').val(),0);" class="button button-primary">Отправить</button>
 </form>
@@ -35,11 +35,5 @@
 {/if}
 
 
-<form id="wall-reply-form" class="wall-submit wall-submit-reply" style="display: none;">
-	<p><textarea rows="4" id="wall-reply-text" class="input-text input-width-full"></textarea></p>
-	<button type="button" onclick="ls.wall.addReply(jQuery('#wall-reply-text').val());" class="button button-primary">Отправить</button>
-</form>
-
-
 
 {include file='footer.tpl'}
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl b/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl
index 04449983..c0e4650a 100644
--- a/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl
+++ b/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl
@@ -15,9 +15,11 @@
 				{$oWall->getText()}
 			</div>
 			
-			<ul class="comment-actions">
-				<li></li>
-			</ul>
+			{if !$aReplyWall}
+				<ul class="comment-actions">
+					<li><a href="#" class="link-dotted" onclick="return ls.wall.toggleReply({$oWall->getId()});">Ответить</a></li>
+				</ul>
+			{/if}
 		</div>
 		
 		
@@ -33,7 +35,11 @@
 				{include file='actions/ActionProfile/wall_items_reply.tpl'}
 			{/if}
 		</div>
-
-		<a href="#" id="wall-button-reply-{$oWall->getId()}" onclick="return ls.wall.toggleReply({$oWall->getId()});" class="link-dotted">Ответить</a>
+		
+		
+		<form class="wall-submit wall-submit-reply" {if !$aReplyWall}style="display: none"{/if}>
+			<textarea rows="4" id="wall-reply-text-{$oWall->getId()}" class="input-text input-width-full js-wall-reply-text" placeholder="Ответить..." onclick="return ls.wall.expandReply({$oWall->getId()});"></textarea>
+			<button type="button" onclick="ls.wall.addReply(jQuery('#wall-reply-text-{$oWall->getId()}').val(), {$oWall->getId()});" class="button button-primary">Отправить</button>
+		</form>
 	</div>
 {/foreach}
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/actions/ActionTalk/blacklist.tpl b/templates/skin/developer-jquery/actions/ActionTalk/blacklist.tpl
index b3eed02d..91b2549c 100644
--- a/templates/skin/developer-jquery/actions/ActionTalk/blacklist.tpl
+++ b/templates/skin/developer-jquery/actions/ActionTalk/blacklist.tpl
@@ -1,20 +1,24 @@
 <section class="block">
-	<h3>{$aLang.talk_blacklist_title}</h3>
-	
-
-	<form onsubmit="return ls.talk.addToBlackList();">
-		<p><label for="talk_blacklist_add">{$aLang.talk_balcklist_add_label}:</label>
-		<input type="text" id="talk_blacklist_add" name="add" class="input-text input-width-full autocomplete-users" /></p>
-	</form>
+	<header class="block-header">
+		<h3>{$aLang.talk_blacklist_title}</h3>
+	</header>
 
 
-	<div id="black_list_block">
-		{if $aUsersBlacklist}
-			<ul class="list" id="black_list">
-				{foreach from=$aUsersBlacklist item=oUser}
-					<li id="blacklist_item_{$oUser->getId()}_area"><a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getLogin()}</a> - <a href="#" id="blacklist_item_{$oUser->getId()}" class="delete">{$aLang.blog_delete}</a></li>
-				{/foreach}
-			</ul>
-		{/if}
+	<div class="block-content">
+		<form onsubmit="return ls.talk.addToBlackList();">
+			<p><label for="talk_blacklist_add">{$aLang.talk_balcklist_add_label}:</label>
+			<input type="text" id="talk_blacklist_add" name="add" class="input-text input-width-full autocomplete-users" /></p>
+		</form>
+
+
+		<div id="black_list_block">
+			{if $aUsersBlacklist}
+				<ul class="list" id="black_list">
+					{foreach from=$aUsersBlacklist item=oUser}
+						<li id="blacklist_item_{$oUser->getId()}_area"><a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getLogin()}</a> - <a href="#" id="blacklist_item_{$oUser->getId()}" class="delete">{$aLang.blog_delete}</a></li>
+					{/foreach}
+				</ul>
+			{/if}
+		</div>
 	</div>
 </section>
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/actions/ActionTalk/filter.tpl b/templates/skin/developer-jquery/actions/ActionTalk/filter.tpl
index 42f3455c..553d4f51 100644
--- a/templates/skin/developer-jquery/actions/ActionTalk/filter.tpl
+++ b/templates/skin/developer-jquery/actions/ActionTalk/filter.tpl
@@ -1,20 +1,23 @@
 <section class="block">
-	<h3>{$aLang.talk_filter_title}</h3>
+	<header class="block-header">
+		<h3>{$aLang.talk_filter_title}</h3>
+	</header>
 	
-	
-	<form action="{router page='talk'}" method="GET" name="talk_filter_form">
-		<p><label for="talk_filter_sender">{$aLang.talk_filter_label_sender}:</label>
-		<input type="text" id="talk_filter_sender" name="sender" value="{$_aRequest.sender}" class="input-text input-width-full" />
-		<small class="note">{$aLang.talk_filter_notice_sender}</small></p>
+	<div class="block-content">
+		<form action="{router page='talk'}" method="GET" name="talk_filter_form">
+			<p><label for="talk_filter_sender">{$aLang.talk_filter_label_sender}:</label>
+			<input type="text" id="talk_filter_sender" name="sender" value="{$_aRequest.sender}" class="input-text input-width-full" />
+			<small class="note">{$aLang.talk_filter_notice_sender}</small></p>
 
-		<p><label for="talk_filter_keyword">{$aLang.talk_filter_label_keyword}:</label>
-		<input type="text" id="talk_filter_keyword" name="keyword" value="{$_aRequest.keyword}" class="input-text input-width-full" />
-		<small class="note">{$aLang.talk_filter_notice_keyword}</small></p>
+			<p><label for="talk_filter_keyword">{$aLang.talk_filter_label_keyword}:</label>
+			<input type="text" id="talk_filter_keyword" name="keyword" value="{$_aRequest.keyword}" class="input-text input-width-full" />
+			<small class="note">{$aLang.talk_filter_notice_keyword}</small></p>
 
-		<p><label for="talk_filter_start">{$aLang.talk_filter_label_date}:</label>
-		<input type="text" id="talk_filter_start" name="start" value="{$_aRequest.start}" style="width: 43%" class="input-text date-picker" readonly="readonly" /> &mdash;
-		<input type="text" id="talk_filter_end" name="end" value="{$_aRequest.end}" style="width: 43%" class="input-text date-picker" readonly="readonly" /></p>
+			<p><label for="talk_filter_start">{$aLang.talk_filter_label_date}:</label>
+			<input type="text" id="talk_filter_start" name="start" value="{$_aRequest.start}" style="width: 43%" class="input-text date-picker" readonly="readonly" /> &mdash;
+			<input type="text" id="talk_filter_end" name="end" value="{$_aRequest.end}" style="width: 43%" class="input-text date-picker" readonly="readonly" /></p>
 
-		<input type="submit" name="submit_talk_filter" value="{$aLang.talk_filter_submit}" class="button" />
-	</form>
+			<input type="submit" name="submit_talk_filter" value="{$aLang.talk_filter_submit}" class="button" />
+		</form>
+	</div>
 </section>
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/actions/ActionTalk/friends.tpl b/templates/skin/developer-jquery/actions/ActionTalk/friends.tpl
index 47b5d87d..89d585ed 100644
--- a/templates/skin/developer-jquery/actions/ActionTalk/friends.tpl
+++ b/templates/skin/developer-jquery/actions/ActionTalk/friends.tpl
@@ -1,21 +1,26 @@
 <section class="block">
-	<h3>{$aLang.block_friends}</h3>
+	<header class="block-header">
+		<h3>{$aLang.block_friends}</h3>
+	</header>
 
-	{if $aUsersFriend}
-		<ul class="list" id="friends">
-			{foreach from=$aUsersFriend item=oFriend}
-				<li>
-					<input id="talk_friend_{$oFriend->getId()}" type="checkbox" name="friend[{$oFriend->getId()}]" class="input-checkbox" /> 
-					<label for="talk_friend_{$oFriend->getId()}" id="talk_friend_{$oFriend->getId()}_label">{$oFriend->getLogin()}</label>
-				</li>
-			{/foreach}
-		</ul>
-		
-		<footer>
-			<a href="#" id="friend_check_all">{$aLang.block_friends_check}</a> | 
-			<a href="#" id="friend_uncheck_all">{$aLang.block_friends_uncheck}</a>
-		</footer>
-	{else}
-		<div class="notice-empty">{$aLang.block_friends_empty}</div>
-	{/if}
+	
+	<div class="block-content">
+		{if $aUsersFriend}
+			<ul class="list" id="friends">
+				{foreach from=$aUsersFriend item=oFriend}
+					<li>
+						<input id="talk_friend_{$oFriend->getId()}" type="checkbox" name="friend[{$oFriend->getId()}]" class="input-checkbox" /> 
+						<label for="talk_friend_{$oFriend->getId()}" id="talk_friend_{$oFriend->getId()}_label">{$oFriend->getLogin()}</label>
+					</li>
+				{/foreach}
+			</ul>
+			
+			<footer>
+				<a href="#" id="friend_check_all">{$aLang.block_friends_check}</a> | 
+				<a href="#" id="friend_uncheck_all">{$aLang.block_friends_uncheck}</a>
+			</footer>
+		{else}
+			<div class="notice-empty">{$aLang.block_friends_empty}</div>
+		{/if}
+	</div>
 </section>
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/actions/ActionTalk/speakers.tpl b/templates/skin/developer-jquery/actions/ActionTalk/speakers.tpl
index 72b5f09c..c934552c 100644
--- a/templates/skin/developer-jquery/actions/ActionTalk/speakers.tpl
+++ b/templates/skin/developer-jquery/actions/ActionTalk/speakers.tpl
@@ -1,29 +1,34 @@
 <section class="block">
-	<h3>{$aLang.talk_speaker_title}</h3>
+	<header class="block-header">
+		<h3>{$aLang.talk_speaker_title}</h3>
+	</header>
 
-	{if $oTalk->getUserId()==$oUserCurrent->getId() or $oUserCurrent->isAdministrator()}
-		<form onsubmit="return ls.talk.addToTalk({$oTalk->getId()});">
-			<p><label for="talk_speaker_add">{$aLang.talk_speaker_add_label}:</label>
-			<input type="text" id="talk_speaker_add" name="add" class="input-text input-width-full autocomplete-users" /></p>
-			<input type="hidden" id="talk_id" value="{$oTalk->getId()}" />
-		</form>
-	{/if}
-
-	<div id="speaker_list_block">
-		{if $oTalk->getTalkUsers()}
-			<ul class="list" id="speaker_list">
-				{foreach from=$oTalk->getTalkUsers() item=oTalkUser name=users}
-					{if $oTalkUser->getUserId()!=$oUserCurrent->getId()}
-					{assign var="oUser" value=$oTalkUser->getUser()}
-						{if $oTalkUser->getUserActive()!=$TALK_USER_DELETE_BY_AUTHOR}
-							<li id="speaker_item_{$oTalkUser->getUserId()}_area">
-								<a class="user {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
-								{if $oTalkUser->getUserActive()==$TALK_USER_ACTIVE and ($oTalk->getUserId()==$oUserCurrent->getId() or $oUserCurrent->isAdministrator())}- <a href="#" id="speaker_item_{$oTalkUser->getUserId()}" class="delete">{$aLang.blog_delete}</a>{/if}
-							</li>
-						{/if}
-					{/if}
-				{/foreach}
-			</ul>
+	
+	<div class="block-content">
+		{if $oTalk->getUserId()==$oUserCurrent->getId() or $oUserCurrent->isAdministrator()}
+			<form onsubmit="return ls.talk.addToTalk({$oTalk->getId()});">
+				<p><label for="talk_speaker_add">{$aLang.talk_speaker_add_label}:</label>
+				<input type="text" id="talk_speaker_add" name="add" class="input-text input-width-full autocomplete-users" /></p>
+				<input type="hidden" id="talk_id" value="{$oTalk->getId()}" />
+			</form>
 		{/if}
+
+		<div id="speaker_list_block">
+			{if $oTalk->getTalkUsers()}
+				<ul class="list" id="speaker_list">
+					{foreach from=$oTalk->getTalkUsers() item=oTalkUser name=users}
+						{if $oTalkUser->getUserId()!=$oUserCurrent->getId()}
+						{assign var="oUser" value=$oTalkUser->getUser()}
+							{if $oTalkUser->getUserActive()!=$TALK_USER_DELETE_BY_AUTHOR}
+								<li id="speaker_item_{$oTalkUser->getUserId()}_area">
+									<a class="user {if $oTalkUser->getUserActive()!=$TALK_USER_ACTIVE}inactive{/if}" href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+									{if $oTalkUser->getUserActive()==$TALK_USER_ACTIVE and ($oTalk->getUserId()==$oUserCurrent->getId() or $oUserCurrent->isAdministrator())}- <a href="#" id="speaker_item_{$oTalkUser->getUserId()}" class="delete">{$aLang.blog_delete}</a>{/if}
+								</li>
+							{/if}
+						{/if}
+					{/foreach}
+				</ul>
+			{/if}
+		</div>
 	</div>
 </section>
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/block.blogInfo.tpl b/templates/skin/developer-jquery/block.blogInfo.tpl
index 8e8ea480..8d00a2aa 100644
--- a/templates/skin/developer-jquery/block.blogInfo.tpl
+++ b/templates/skin/developer-jquery/block.blogInfo.tpl
@@ -1,10 +1,20 @@
-<section class="block">		
-	<h3>{$aLang.block_blog_info}</h3>						
-	<p id="block_blog_info"></p>					
+<section class="block">
+	<header class="block-header">
+		<h3>{$aLang.block_blog_info}</h3>
+	</header>
+	
+	<div class="block-content">
+		<p id="block_blog_info"></p>
+	</div>	
 </section>
 
 
-<section class="block">		
-	<h3>{$aLang.block_blog_info_note}</h3>						
-	<p>{$aLang.block_blog_info_note_text}</p>					
+<section class="block">
+	<header class="block-header">
+		<h3>{$aLang.block_blog_info_note}</h3>
+	</header>
+	
+	<div class="block-content">	
+		<p>{$aLang.block_blog_info_note_text}</p>
+	</div>	
 </section>
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/block.blogs.tpl b/templates/skin/developer-jquery/block.blogs.tpl
index fc9aec66..a7ab59fb 100644
--- a/templates/skin/developer-jquery/block.blogs.tpl
+++ b/templates/skin/developer-jquery/block.blogs.tpl
@@ -1,22 +1,26 @@
 <div class="block" id="block_blogs">
-	<h3>{$aLang.block_blogs}</h3>
+	<header class="block-header">
+		<h3>{$aLang.block_blogs}</h3>
+	</header>
 	
 	
-	<ul class="nav nav-pills">
-		<li id="block_blogs_item_top" class="active"><a href="#">{$aLang.block_blogs_top}</a></li>
-		{if $oUserCurrent}
-			<li id="block_blogs_item_join"><a href="#">{$aLang.block_blogs_join}</a></li>
-			<li id="block_blogs_item_self"><a href="#">{$aLang.block_blogs_self}</a></li>
-		{/if}
-	</ul>
-	
-	
-	<div class="block-content" id="block_blogs_content">
-		{$sBlogsTop}
-	</div>
+	<div class="block-content">
+		<ul class="nav nav-pills">
+			<li id="block_blogs_item_top" class="active"><a href="#">{$aLang.block_blogs_top}</a></li>
+			{if $oUserCurrent}
+				<li id="block_blogs_item_join"><a href="#">{$aLang.block_blogs_join}</a></li>
+				<li id="block_blogs_item_self"><a href="#">{$aLang.block_blogs_self}</a></li>
+			{/if}
+		</ul>
+		
+		
+		<div id="block_blogs_content">
+			{$sBlogsTop}
+		</div>
 
-	
-	<footer>
-		<a href="{router page='blogs'}">{$aLang.block_blogs_all}</a>
-	</footer>
+		
+		<footer>
+			<a href="{router page='blogs'}">{$aLang.block_blogs_all}</a>
+		</footer>
+	</div>
 </div>
diff --git a/templates/skin/developer-jquery/block.stream.tpl b/templates/skin/developer-jquery/block.stream.tpl
index 641192ca..9b623ce7 100644
--- a/templates/skin/developer-jquery/block.stream.tpl
+++ b/templates/skin/developer-jquery/block.stream.tpl
@@ -1,17 +1,21 @@
 <section class="block block-type-stream" id="block_stream">
-	<h3><a href="{router page='comments'}" title="{$aLang.block_stream_comments_all}">{$aLang.block_stream}</a></h3>
+	<header class="block-header">
+		<h3><a href="{router page='comments'}" title="{$aLang.block_stream_comments_all}">{$aLang.block_stream}</a></h3>
+	</header>
 	
 	
-	<ul class="nav nav-pills">						
-		<li id="block_stream_item_comment" class="active"><a href="#">{$aLang.block_stream_comments}</a></li>
-		<li id="block_stream_item_topic"><a href="#">{$aLang.block_stream_topics}</a></li>
+	<div class="block-content">
+		<ul class="nav nav-pills">						
+			<li id="block_stream_item_comment" class="active"><a href="#">{$aLang.block_stream_comments}</a></li>
+			<li id="block_stream_item_topic"><a href="#">{$aLang.block_stream_topics}</a></li>
+			
+			{hook run='block_stream_nav_item'}
+		</ul>					
 		
-		{hook run='block_stream_nav_item'}
-	</ul>					
-	
-	
-	<div class="block-content" id="block_stream_content">
-		{$sStreamComments}
+		
+		<div id="block_stream_content">
+			{$sStreamComments}
+		</div>
 	</div>
 </section>
 
diff --git a/templates/skin/developer-jquery/block.streamConfig.tpl b/templates/skin/developer-jquery/block.streamConfig.tpl
index d2aee961..a3ecd7df 100644
--- a/templates/skin/developer-jquery/block.streamConfig.tpl
+++ b/templates/skin/developer-jquery/block.streamConfig.tpl
@@ -14,80 +14,95 @@
 
 
 	<section class="block block-type-activity">
-		<h3>{$aLang.stream_block_config_title}</h3>
-		<small class="note">{$aLang.stream_settings_note_filter}</small>
+		<header class="block-header">
+			<h3>{$aLang.stream_block_config_title}</h3>
+		</header>
 		
-		<ul class="activity-settings-filter">
-			{foreach from=$aStreamEventTypes key=sType item=aEventType}
-				{if !($oConfig->get('module.stream.disable_vote_events') && substr($sType, 0, 4) == 'vote')}
-					<li>
-						<label>
-							<input class="streamEventTypeCheckbox input-checkbox"
-								type="checkbox"
-								id="strn_et_{$sType}"
-								{if in_array($sType, $aStreamTypesList)}checked="checked"{/if}
-								onClick="ls.stream.switchEventType('{$sType}')" />
-							{assign var=langKey value="stream_event_type_`$sType`"}
-							{$aLang.$langKey}
-						</label>
-					</li>
-				{/if}
-			{/foreach}
-		</ul>
-	</section>
-		
-		
-		
-	<section class="block block-type-activity">
-		<h3>{$aLang.stream_block_users_title}</h3>
-		<small class="note">{$aLang.stream_settings_note_follow_user}</small>
-
-		<p><input type="text" id="stream_users_complete" autocomplete="off" class="input-text input-width-200" />
-		<a href="javascript:ls.stream.appendUser()" class="button">{$aLang.stream_block_config_append}</a></p>
-		
-		{if count($aStreamSubscribedUsers)}
-			<ul id="stream_block_users_list" class="max-height-200">
-				{foreach from=$aStreamSubscribedUsers item=oUser}
-					{assign var=iUserId value=$oUser->getId()}
-					
-					{if !isset($aStreamFriends.$iUserId)}
-						<li><input class="streamUserCheckbox input-checkbox"
+		<div class="block-content">
+			<small class="note">{$aLang.stream_settings_note_filter}</small>
+			
+			<ul class="activity-settings-filter">
+				{foreach from=$aStreamEventTypes key=sType item=aEventType}
+					{if !($oConfig->get('module.stream.disable_vote_events') && substr($sType, 0, 4) == 'vote')}
+						<li>
+							<label>
+								<input class="streamEventTypeCheckbox input-checkbox"
 									type="checkbox"
-									id="strm_u_{$iUserId}"
-									checked="checked"
-									onClick="if (jQuery(this).prop('checked')) { ls.stream.subscribe({$iUserId}) } else { ls.stream.unsubscribe({$iUserId}) } " />
-							<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+									id="strn_et_{$sType}"
+									{if in_array($sType, $aStreamTypesList)}checked="checked"{/if}
+									onClick="ls.stream.switchEventType('{$sType}')" />
+								{assign var=langKey value="stream_event_type_`$sType`"}
+								{$aLang.$langKey}
+							</label>
 						</li>
 					{/if}
 				{/foreach}
 			</ul>
-		{else}
-			<ul id="stream_block_users_list"></ul>
-			<p id="stream_no_subscribed_users">{$aLang.stream_no_subscribed_users}</p>
-		{/if}
+		</div>
 	</section>
 		
 		
 		
 	<section class="block block-type-activity">
-		<h3>{$aLang.stream_block_users_friends}</h3>
-		<small class="note">{$aLang.stream_settings_note_follow_friend}</small>
+		<header class="block-header">
+			<h3>{$aLang.stream_block_users_title}</h3>
+		</header>
 		
-		{if count($aStreamFriends)}
-			<ul class="stream-settings-friends max-height-200">
-				{foreach from=$aStreamFriends item=oUser}
-					{assign var=iUserId value=$oUser->getId()}
-					<li><input class="streamUserCheckbox input-checkbox"
-								type="checkbox"
-								id="strm_u_{$iUserId}"
-								{if isset($aStreamSubscribedUsers.$iUserId)} checked="checked"{/if}
-								onClick="if (jQuery(this).prop('checked')) { ls.stream.subscribe({$iUserId}) } else { ls.stream.unsubscribe({$iUserId}) } " />
-						<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
-					</li>
-				{/foreach}
-			</ul>
-		{else}
-			<small class="note">{$aLang.stream_no_subscribed_users}</small>
-		{/if}
+		<div class="block-content">
+			<small class="note">{$aLang.stream_settings_note_follow_user}</small>
+			
+			<p><input type="text" id="stream_users_complete" autocomplete="off" class="input-text input-width-200" />
+			<a href="javascript:ls.stream.appendUser()" class="button">{$aLang.stream_block_config_append}</a></p>
+			
+			{if count($aStreamSubscribedUsers)}
+				<ul id="stream_block_users_list" class="max-height-200">
+					{foreach from=$aStreamSubscribedUsers item=oUser}
+						{assign var=iUserId value=$oUser->getId()}
+						
+						{if !isset($aStreamFriends.$iUserId)}
+							<li><input class="streamUserCheckbox input-checkbox"
+										type="checkbox"
+										id="strm_u_{$iUserId}"
+										checked="checked"
+										onClick="if (jQuery(this).prop('checked')) { ls.stream.subscribe({$iUserId}) } else { ls.stream.unsubscribe({$iUserId}) } " />
+								<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+							</li>
+						{/if}
+					{/foreach}
+				</ul>
+			{else}
+				<ul id="stream_block_users_list"></ul>
+				<p id="stream_no_subscribed_users">{$aLang.stream_no_subscribed_users}</p>
+			{/if}
+		</div>
+	</section>
+		
+		
+		
+	<section class="block block-type-activity">
+		<header class="block-header">
+			<h3>{$aLang.stream_block_users_friends}</h3>
+		</header>
+		
+		<div class="block-content">
+			<small class="note">{$aLang.stream_settings_note_follow_friend}</small>
+			
+			{if count($aStreamFriends)}
+				<ul class="stream-settings-friends max-height-200">
+					{foreach from=$aStreamFriends item=oUser}
+						{assign var=iUserId value=$oUser->getId()}
+						<li><input class="streamUserCheckbox input-checkbox"
+									type="checkbox"
+									id="strm_u_{$iUserId}"
+									{if isset($aStreamSubscribedUsers.$iUserId)} checked="checked"{/if}
+									onClick="if (jQuery(this).prop('checked')) { ls.stream.subscribe({$iUserId}) } else { ls.stream.unsubscribe({$iUserId}) } " />
+							<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+						</li>
+					{/foreach}
+				</ul>
+			{else}
+				<small class="note">{$aLang.stream_no_subscribed_users}</small>
+			{/if}
+		</div>
 	</section>
 {/if}
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/block.tags.tpl b/templates/skin/developer-jquery/block.tags.tpl
index 064e533c..5c270386 100644
--- a/templates/skin/developer-jquery/block.tags.tpl
+++ b/templates/skin/developer-jquery/block.tags.tpl
@@ -1,13 +1,18 @@
 <section class="block">
-	<h3>{$aLang.block_tags}</h3>
-
-	{if $aTags}
-		<ul class="tag-cloud">						
-			{foreach from=$aTags item=oTag}
-				<li><a class="tag-size-{$oTag->getSize()}" href="{router page='tag'}{$oTag->getText()|escape:'url'}/">{$oTag->getText()|escape:'html'}</a></li>	
-			{/foreach}
-		</ul>
-	{else}	
-		<div class="block-empty">{$aLang.block_empty_no_tags}</div>
-	{/if}
+	<header class="block-header">
+		<h3>{$aLang.block_tags}</h3>
+	</header>
+	
+	
+	<div class="block-content">
+		{if $aTags}
+			<ul class="tag-cloud">						
+				{foreach from=$aTags item=oTag}
+					<li><a class="tag-size-{$oTag->getSize()}" href="{router page='tag'}{$oTag->getText()|escape:'url'}/">{$oTag->getText()|escape:'html'}</a></li>	
+				{/foreach}
+			</ul>
+		{else}	
+			<div class="notice-empty">{$aLang.block_empty_no_tags}</div>
+		{/if}
+	</div>
 </section>
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/block.tagsCity.tpl b/templates/skin/developer-jquery/block.tagsCity.tpl
index e61b04c5..0f4e7bee 100644
--- a/templates/skin/developer-jquery/block.tagsCity.tpl
+++ b/templates/skin/developer-jquery/block.tagsCity.tpl
@@ -1,11 +1,16 @@
 {if $aCityList && count($aCityList)>0}
-	<section class="block">				
-		<h3>{$aLang.block_city_tags}</h3>	
+	<section class="block">
+		<header class="block-header">
+			<h3>{$aLang.block_city_tags}</h3>
+		</header>
 		
-		<ul class="tag-cloud">
-			{foreach from=$aCityList item=aCity}
-				<li><a class="tag-size-{$aCity.size}" href="{router page='people'}city/{$aCity.name|escape:'url'}/">{$aCity.name|escape:'html'}</a></li>	
-			{/foreach}					
-		</ul>									
+		
+		<div class="block-content">
+			<ul class="tag-cloud">
+				{foreach from=$aCityList item=aCity}
+					<li><a class="tag-size-{$aCity.size}" href="{router page='people'}city/{$aCity.name|escape:'url'}/">{$aCity.name|escape:'html'}</a></li>	
+				{/foreach}					
+			</ul>	
+		</div>		
 	</section>
 {/if}
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/block.tagsCountry.tpl b/templates/skin/developer-jquery/block.tagsCountry.tpl
index 45ace609..166b8b44 100644
--- a/templates/skin/developer-jquery/block.tagsCountry.tpl
+++ b/templates/skin/developer-jquery/block.tagsCountry.tpl
@@ -1,11 +1,16 @@
 {if $aCountryList && count($aCountryList)>0}
-	<section class="block">				
-		<h3>{$aLang.block_country_tags}</h3>
+	<section class="block">
+		<header class="block-header">
+			<h3>{$aLang.block_country_tags}</h3>
+		</header>
 		
-		<ul class="tag-cloud">
-			{foreach from=$aCountryList item=aCountry}
-				<li><a class="tag-size-{$aCountry.size}" href="{router page='people'}country/{$aCountry.name|escape:'url'}/">{$aCountry.name|escape:'html'}</a></li>	
-			{/foreach}					
-		</ul>									
+		
+		<div class="block-content">
+			<ul class="tag-cloud">
+				{foreach from=$aCountryList item=aCountry}
+					<li><a class="tag-size-{$aCountry.size}" href="{router page='people'}country/{$aCountry.name|escape:'url'}/">{$aCountry.name|escape:'html'}</a></li>	
+				{/foreach}					
+			</ul>	
+		</div>		
 	</section>
 {/if}
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/block.userfeedBlogs.tpl b/templates/skin/developer-jquery/block.userfeedBlogs.tpl
index 8526a98f..4b777571 100644
--- a/templates/skin/developer-jquery/block.userfeedBlogs.tpl
+++ b/templates/skin/developer-jquery/block.userfeedBlogs.tpl
@@ -1,22 +1,27 @@
 {if $oUserCurrent}
 	<section class="block block-type-activity">
-		<h3>{$aLang.userfeed_block_blogs_title}</h3>
-		<small class="note">{$aLang.userfeed_settings_note_follow_blogs}</small>
+		<header class="block-header">
+			<h3>{$aLang.userfeed_block_blogs_title}</h3>
+		</header>
+		
+		<div class="block-content">
+			<small class="note">{$aLang.userfeed_settings_note_follow_blogs}</small>
 
-		{if count($aUserfeedBlogs)}
-			<ul class="stream-settings-blogs">
-				{foreach from=$aUserfeedBlogs item=oBlog}
-					{assign var=iBlogId value=$oBlog->getId()}
-					<li><input class="userfeedBlogCheckbox input-checkbox"
-								type="checkbox"
-								{if isset($aUserfeedSubscribedBlogs.$iBlogId)} checked="checked"{/if}
-								onClick="if (jQuery(this).prop('checked')) { ls.userfeed.subscribe('blogs',{$iBlogId}) } else { ls.userfeed.unsubscribe('blogs',{$iBlogId}) } " />
-						<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>
-					</li>
-				{/foreach}
-			</ul>
-		{else}
-			<small class="note">{$aLang.userfeed_no_blogs}</small>
-		{/if}
+			{if count($aUserfeedBlogs)}
+				<ul class="stream-settings-blogs">
+					{foreach from=$aUserfeedBlogs item=oBlog}
+						{assign var=iBlogId value=$oBlog->getId()}
+						<li><input class="userfeedBlogCheckbox input-checkbox"
+									type="checkbox"
+									{if isset($aUserfeedSubscribedBlogs.$iBlogId)} checked="checked"{/if}
+									onClick="if (jQuery(this).prop('checked')) { ls.userfeed.subscribe('blogs',{$iBlogId}) } else { ls.userfeed.unsubscribe('blogs',{$iBlogId}) } " />
+							<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a>
+						</li>
+					{/foreach}
+				</ul>
+			{else}
+				<small class="notice-empty">{$aLang.userfeed_no_blogs}</small>
+			{/if}
+		</div>
 	</section>
 {/if}
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/block.userfeedUsers.tpl b/templates/skin/developer-jquery/block.userfeedUsers.tpl
index 4e5cdff8..6aefb3e0 100644
--- a/templates/skin/developer-jquery/block.userfeedUsers.tpl
+++ b/templates/skin/developer-jquery/block.userfeedUsers.tpl
@@ -14,54 +14,64 @@
 
 
 	<section class="block block-type-activity">
-		<h3>{$aLang.userfeed_block_users_title}</h3>
-		<small class="note">{$aLang.userfeed_settings_note_follow_user}</small>
+		<header class="block-header">
+			<h3>{$aLang.userfeed_block_users_title}</h3>
+		</header>
 		
-		<div class="stream-settings-userlist">
-			<p><input type="text" id="userfeed_users_complete" autocomplete="off" class="input-text input-width-200" />
-			<a href="javascript:ls.userfeed.appendUser()" class="button">{$aLang.userfeed_block_users_append}</a></p>
+		<div class="block-content">
+			<small class="note">{$aLang.userfeed_settings_note_follow_user}</small>
 			
-			{if count($aUserfeedSubscribedUsers)}
-				<ul id="userfeed_block_users_list" class="max-height-200">
-					{foreach from=$aUserfeedSubscribedUsers item=oUser}
-						{assign var=iUserId value=$oUser->getId()}
-						
-						{if !isset($aUserfeedFriends.$iUserId)}
-							<li><input class="userfeedUserCheckbox input-checkbox"
-										type="checkbox"
-										id="usf_u_{$iUserId}"
-										checked="checked"
-										onClick="if (jQuery(this).prop('checked')) { ls.userfeed.subscribe('users',{$iUserId}) } else { ls.userfeed.unsubscribe('users',{$iUserId}) } " />
-								<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
-							</li>
-						{/if}
-					{/foreach}
-				 </ul>
-			{else}
-				<ul id="userfeed_block_users_list"></ul>
-			{/if}
+			<div class="stream-settings-userlist">
+				<p><input type="text" id="userfeed_users_complete" autocomplete="off" class="input-text input-width-200" />
+				<a href="javascript:ls.userfeed.appendUser()" class="button">{$aLang.userfeed_block_users_append}</a></p>
+				
+				{if count($aUserfeedSubscribedUsers)}
+					<ul id="userfeed_block_users_list" class="max-height-200">
+						{foreach from=$aUserfeedSubscribedUsers item=oUser}
+							{assign var=iUserId value=$oUser->getId()}
+							
+							{if !isset($aUserfeedFriends.$iUserId)}
+								<li><input class="userfeedUserCheckbox input-checkbox"
+											type="checkbox"
+											id="usf_u_{$iUserId}"
+											checked="checked"
+											onClick="if (jQuery(this).prop('checked')) { ls.userfeed.subscribe('users',{$iUserId}) } else { ls.userfeed.unsubscribe('users',{$iUserId}) } " />
+									<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+								</li>
+							{/if}
+						{/foreach}
+					 </ul>
+				{else}
+					<ul id="userfeed_block_users_list"></ul>
+				{/if}
+			</div>
 		</div>
 	</section>
 	
 	
-	<section class="block block-type-activity">	
-		{if count($aUserfeedFriends)}
-			<h3>{$aLang.userfeed_block_users_friends}</h3>
-			<small class="note">{$aLang.userfeed_settings_note_follow_friend}</small>
+	{if count($aUserfeedFriends)}
+		<section class="block block-type-activity">
+			<header class="block-header">
+				<h3>{$aLang.userfeed_block_users_friends}</h3>
+			</header>
 			
-			<ul class="stream-settings-friends max-height-200">
-				{foreach from=$aUserfeedFriends item=oUser}
-					{assign var=iUserId value=$oUser->getId()}
-					
-					<li><input class="userfeedUserCheckbox input-checkbox"
-								type="checkbox"
-								id="usf_u_{$iUserId}"
-								{if isset($aUserfeedSubscribedUsers.$iUserId)} checked="checked"{/if}
-								onClick="if (jQuery(this).prop('checked')) { ls.userfeed.subscribe('users',{$iUserId}) } else { ls.userfeed.unsubscribe('users',{$iUserId}) } " />
-						<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
-					</li>
-				{/foreach}
-			</ul>
-		{/if}
-	</section>
+			<div class="block-content">
+				<small class="note">{$aLang.userfeed_settings_note_follow_friend}</small>
+				
+				<ul class="stream-settings-friends max-height-200">
+					{foreach from=$aUserfeedFriends item=oUser}
+						{assign var=iUserId value=$oUser->getId()}
+						
+						<li><input class="userfeedUserCheckbox input-checkbox"
+									type="checkbox"
+									id="usf_u_{$iUserId}"
+									{if isset($aUserfeedSubscribedUsers.$iUserId)} checked="checked"{/if}
+									onClick="if (jQuery(this).prop('checked')) { ls.userfeed.subscribe('users',{$iUserId}) } else { ls.userfeed.unsubscribe('users',{$iUserId}) } " />
+							<a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a>
+						</li>
+					{/foreach}
+				</ul>
+			</div>
+		</section>
+	{/if}
 {/if}
\ No newline at end of file
diff --git a/templates/skin/developer-jquery/comment_tree.tpl b/templates/skin/developer-jquery/comment_tree.tpl
index 9826bdbe..b4c0852f 100644
--- a/templates/skin/developer-jquery/comment_tree.tpl
+++ b/templates/skin/developer-jquery/comment_tree.tpl
@@ -6,12 +6,14 @@
 }
 
 <div class="comments" id="comments">
-	{if $bAllowSubscribe and $oUserCurrent}
-		<input {if $oSubscribeComment and $oSubscribeComment->getStatus()}checked="checked"{/if} type="checkbox" id="comment_subscribe" onchange="ls.subscribe.toggle('{$sTargetType}_new_comment','{$iTargetId}','',this.checked);"> &mdash; <label for="comment_subscribe">{$aLang.comment_subscribe}</label>
-	{/if}
-
 	<header class="comments-header">
 		<h3>{$iCountComment} {$iCountComment|declension:$aLang.comment_declension:'russian'}</h3>
+		
+		{if $bAllowSubscribe and $oUserCurrent}
+			<input {if $oSubscribeComment and $oSubscribeComment->getStatus()}checked="checked"{/if} type="checkbox" id="comment_subscribe" class="input-checkbox" onchange="ls.subscribe.toggle('{$sTargetType}_new_comment','{$iTargetId}','',this.checked);">
+			<label for="comment_subscribe">{$aLang.comment_subscribe}</label>
+		{/if}
+	
 		<a name="comments"></a>
 	</header>
 
diff --git a/templates/skin/developer-jquery/css/blocks.css b/templates/skin/developer-jquery/css/blocks.css
index 7901684c..11023f32 100644
--- a/templates/skin/developer-jquery/css/blocks.css
+++ b/templates/skin/developer-jquery/css/blocks.css
@@ -2,17 +2,18 @@
 	БЛОКИ
 ------------------------------------------------------------------- */
 
-.block 			{ padding: 20px; background: #fafafa; margin-bottom: 15px; border-radius: 3px; }
+.block 			{ background: #fafafa; margin-bottom: 30px; border-radius: 3px; }
 
-.block h3 		{ font-size: 20px; line-height: 1em; font-weight: normal; margin-bottom: 20px; }
-.block h3 a 	{ text-decoration: none; }
-.block footer 	{ margin-top: 15px; font-size: 12px; }
+.block .block-header 		{ padding: 13px 20px; background: #EAF6F9; border-bottom: 1px solid #D2E8EF; position: relative; }
+.block .block-header h3 	{ font-size: 16px; line-height: 1em; font-weight: normal; }
+.block .block-header h3 a 	{ text-decoration: none; }
+.block footer 				{ margin-top: 15px; font-size: 12px; }
+.block .block-content 		{ padding: 20px; }
 
-.block .max-height-200 { overflow: auto; max-height: 200px; _height: expression( this.scrollHeight > 200 ? "200px" : "auto" ); position: relative; }
+.block .max-height-200 		{ overflow: auto; max-height: 200px; _height: expression( this.scrollHeight > 200 ? "200px" : "auto" ); position: relative; }
 
 
 /* Block Type - Activity Settings */
-.block.block-type-activity h3 		{ margin-bottom: 7px; }
 .block.block-type-activity p 		{ margin-bottom: 15px; }
 .block.block-type-activity ul li 	{ margin-bottom: 5px; }
 .block.block-type-activity .note 	{ display: block; margin-bottom: 15px; color: #aaa; }
diff --git a/templates/skin/developer-jquery/css/comments.css b/templates/skin/developer-jquery/css/comments.css
index f81a97b4..eea92051 100644
--- a/templates/skin/developer-jquery/css/comments.css
+++ b/templates/skin/developer-jquery/css/comments.css
@@ -4,7 +4,7 @@
 
 /* Блок с комментариями */
 .comments-header { margin-bottom: 20px; }
-.comments-header h3 { font-size: 24px; }
+.comments-header h3 { font-size: 24px; margin-bottom: 5px; }
 
 .comments { margin-bottom: 30px; }
 
diff --git a/templates/skin/developer-jquery/css/common.css b/templates/skin/developer-jquery/css/common.css
index a2dc0b76..12e2dc1a 100644
--- a/templates/skin/developer-jquery/css/common.css
+++ b/templates/skin/developer-jquery/css/common.css
@@ -168,6 +168,8 @@
 .ta-r { text-align: right !important; }
 .va-m { vertical-align: middle; }
 
+.hidden { display: none; }
+
 .user, .ls-user { font-weight: bold; color: #333; }
 .user .icon-user { margin-right: 3px; }
 .user.inactive { color: #aaa; }
diff --git a/templates/skin/developer-jquery/css/topic.css b/templates/skin/developer-jquery/css/topic.css
index 7d89d079..6dbffed7 100644
--- a/templates/skin/developer-jquery/css/topic.css
+++ b/templates/skin/developer-jquery/css/topic.css
@@ -8,7 +8,7 @@
 .topic .topic-header .topic-url 		{ margin-bottom: 15px; }
 .topic .topic-header .topic-url a 		{ background: #eee; border-radius: 3px; padding: 3px 10px 4px; text-decoration: none; }
 .topic .topic-header .topic-info 		{ margin-bottom: 25px; color: #777; }
-.topic .topic-header .topic-info time 	{ margin-right: 15px; }
+.topic .topic-header .topic-info a 		{ margin-right: 15px; }
 
 /* Content */
 .topic .topic-content { margin-bottom: 15px; }
diff --git a/templates/skin/developer-jquery/css/wall.css b/templates/skin/developer-jquery/css/wall.css
index 38e60d50..b89ca523 100644
--- a/templates/skin/developer-jquery/css/wall.css
+++ b/templates/skin/developer-jquery/css/wall.css
@@ -3,11 +3,16 @@
 -------------------------------------------- */
 
 .wall-submit 					{ margin-bottom: 30px; }
-.wall-submit.wall-submit-reply 	{ margin: 10px 0 10px 25px; }
+.wall-submit.wall-submit-reply 	{ margin: 2px 0 2px 25px; padding: 7px; background: #fafafa; }
+.wall-submit.wall-submit-reply textarea 		{ height: 28px; margin: 0; }
+.wall-submit.wall-submit-reply button 			{ display: none; }
+.wall-submit.wall-submit-reply.active textarea 	{ height: 80px; margin-bottom: 5px; }
+.wall-submit.wall-submit-reply.active button 	{ display: inline-block; }
 .wall-submit p 					{ margin-bottom: 5px; }
 
 .comments.wall,
 .wall .comment 		{ margin-bottom: 2px; }
+.wall .comment-content { margin-bottom: 0; }
 
 .comment.wall-comment-reply 					{ min-height: 0; padding-left: 48px; }
 .comment.wall-comment-reply .comment-avatar 	{ width: 30px; height: 30px; }
diff --git a/templates/skin/developer-jquery/topic_part_header.tpl b/templates/skin/developer-jquery/topic_part_header.tpl
index ac925141..9b1fe07f 100644
--- a/templates/skin/developer-jquery/topic_part_header.tpl
+++ b/templates/skin/developer-jquery/topic_part_header.tpl
@@ -30,10 +30,10 @@
 		
 		
 		<div class="topic-info">
+			<a href="{$oBlog->getUrlFull()}" class="topic-blog">{$oBlog->getTitle()|escape:'html'}</a>
+			
 			<time datetime="{date_format date=$oTopic->getDateAdd() format='c'}" pubdate title="{date_format date=$oTopic->getDateAdd() format='j F Y, H:i'}">
 				{date_format date=$oTopic->getDateAdd() format="j F Y, H:i"}
 			</time>
-			
-			<a href="{$oBlog->getUrlFull()}" class="topic-blog">{$oBlog->getTitle()|escape:'html'}</a>
 		</div>
 	</header>
\ No newline at end of file