diff --git a/res/menu_icons.png b/res/menu_icons.png
index 6faf986..b798a89 100755
Binary files a/res/menu_icons.png and b/res/menu_icons.png differ
diff --git a/res/note.png b/res/note.png
new file mode 100644
index 0000000..c9e3efd
Binary files /dev/null and b/res/note.png differ
diff --git a/res/ovk_attach.png b/res/ovk_attach.png
index a2e19dd..7b12f7e 100755
Binary files a/res/ovk_attach.png and b/res/ovk_attach.png differ
diff --git a/res/podrobnee.js b/res/podrobnee.js
index 6a64686..2587f0c 100755
--- a/res/podrobnee.js
+++ b/res/podrobnee.js
@@ -1,13 +1,18 @@
-let p_bt = document.querySelector('.podrobnee');
-let p_content = document.querySelector('.podrobnee_content');
+let p_bt = null
+let p_content = null
+if(document.querySelector('.podrobnee') != null) {
 
-p_bt.addEventListener('click', function(){
-	let text = ["Показать подробнее", "Скрыть"];
-	p_bt.innerText = text[Number(p_bt.innerText === text[0])]
-	p_content.classList.toggle('active');
-});
+    p_bt = document.querySelector('.podrobnee');
+    p_content = document.querySelector('.podrobnee_content');
 
-u(".post-like-button").on("click", function(e) {
+    p_bt.addEventListener('click', function(){
+        let text = ["Показать подробнее", "Скрыть"];
+        p_bt.innerText = text[Number(p_bt.innerText === text[0])]
+        p_content.classList.toggle('active');
+    });
+}
+
+/*u(".post-like-button").on("click", function(e) {
     e.preventDefault();
     
     var thisBtn = u(this).first();
@@ -25,4 +30,61 @@ u(".post-like-button").on("click", function(e) {
     }
     
     return false;
-});
+});*/
+
+function mobileRepost(postId) {
+    let el   = document.getElementById("post"+postId+"_actions")
+    let hash = document.querySelector("meta[name=csrf]").getAttribute("value");
+
+    if(document.querySelector("#post"+postId+"_actions #mobile_repost"+postId) == null) {
+        el.insertAdjacentHTML("beforeend", `
+            <div class="mobile_repost" id="mobile_repost${postId}">
+                ${tr('your_comment')}:
+                <textarea name="text" id='uRepostMsgInput_${postId}'></textarea><br/>
+                <input type="hidden" name="hash" value="${hash}">
+                <input id="repSubmit" class="button" type="button" value="${tr('send')}">
+            </div>
+        `)
+
+        repSubmit.onclick = () => {
+            text = document.querySelector("#uRepostMsgInput_"+postId).value;
+            type = "wall";
+
+            let xhr = new XMLHttpRequest()
+            xhr.open("POST", "/wall"+postId+"/repost?hash="+encodeURIComponent(hash), true);
+            xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+            xhr.onload = (function() {
+                if(xhr.responseText.indexOf("wall_owner") === -1) {
+                    el.innerHTML = "can't repost"
+                } else {
+                    let jsonR = JSON.parse(xhr.responseText);
+                    location.href = "/wall" + jsonR.wall_owner
+                }
+            });
+
+            xhr.send('text='+encodeURI(text) + '&type='+type);
+        }
+    } else {
+        document.getElementById("post"+postId+"_actions").innerHTML = ""
+    }
+}
+
+if(document.querySelector("#_noteDelete") != null) {
+    document.querySelector("#_noteDelete").addEventListener("click", (e) => {
+        let link = e.currentTarget.href
+        let hash = document.querySelector("meta[name=csrf]").getAttribute("value")
+        let id   = e.currentTarget.dataset.id
+    
+        let xhr = new XMLHttpRequest()
+        xhr.open("POST", link)
+        xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+    
+        xhr.onload = () => {
+            location.href = "/notes"+id
+        }
+        
+        xhr.send('hash='+encodeURIComponent(hash));
+    
+        e.preventDefault()
+    })
+}
\ No newline at end of file
diff --git a/res/youtube_video.png b/res/youtube_video.png
new file mode 100644
index 0000000..e080d89
Binary files /dev/null and b/res/youtube_video.png differ
diff --git a/stylesheet.css b/stylesheet.css
index 1cd6edf..36fb5bb 100755
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -50,7 +50,7 @@ input, button { -webkit-appearance: button;}
     background-color: #f7f7f7;
     margin: 0 auto;
     font-family: tahoma, verdana, arial, sans-serif;
-	max-width: 580px;
+    max-width: 580px;
 }
 
 .app_layer{
@@ -137,7 +137,7 @@ input, button { -webkit-appearance: button;}
     margin: 0.5em -12px;
 }
 
-.button, .fileInput, input[type=submit], input[type=reset] {
+.button, .fileInput, input[type=submit], input[type=button], input[type=reset] {
     display: inline-block;
     border: none;
     border-radius: 3px;
@@ -357,15 +357,15 @@ input, button { -webkit-appearance: button;}
     outline: none;
     cursor: pointer;
     vertical-align: middle;
-	margin-top: 0%;
+    margin-top: 0%;
 }
 
 .formInput > input[type=checkbox]{
-	background-image: url("data:image/gif;base64,R0lGODlhDwA4ALMAAP//////AP8A//8AAAD//wD/AAAA/wAAADtZd8XKzuHh4crKysHBwba2tv///wAAACH5BAEAAA4ALAAAAAAPADgAAASzcMlJqVsg653X5SDgYeE2luaHdup6rmKLvq5c0rMdjlUvXb6eDoRAkFBF4yqZOBKLi2aJSUNomE1VEoCNkRLJYiLB+oLF5LJmjBinnOO0BncDBi2NvH6/dzQUgIGCgA1+g4cKhX+IgoqMjYaPhJGSjpKJlI+WlZmMm5qdiIp8pHl+paShh0WLj0mtiEywg0kMCbOBTAyUCLlolkkKWJiLZ8PEgGxogZtsY5CwcYOfnqeofREAOw==");
+    background-image: url("data:image/gif;base64,R0lGODlhDwA4ALMAAP//////AP8A//8AAAD//wD/AAAA/wAAADtZd8XKzuHh4crKysHBwba2tv///wAAACH5BAEAAA4ALAAAAAAPADgAAASzcMlJqVsg653X5SDgYeE2luaHdup6rmKLvq5c0rMdjlUvXb6eDoRAkFBF4yqZOBKLi2aJSUNomE1VEoCNkRLJYiLB+oLF5LJmjBinnOO0BncDBi2NvH6/dzQUgIGCgA1+g4cKhX+IgoqMjYaPhJGSjpKJlI+WlZmMm5qdiIp8pHl+paShh0WLj0mtiEywg0kMCbOBTAyUCLlolkkKWJiLZ8PEgGxogZtsY5CwcYOfnqeofREAOw==");
 }
 
 .formInput > input[type=radio]{
-	background-image: url("/themepack/mobile_ovk/0.0.1.0/resource/radio.png");
+    background-image: url("/themepack/mobile_ovk/0.0.1.0/resource/radio.png");
 }
 
 .formInput > input[type=checkbox]:hover, .formInput > input[type=radio]:hover {
@@ -443,6 +443,12 @@ input, button { -webkit-appearance: button;}
     color: #9a6d6d;
 }
 
+.alert.yellow {
+    border-color:#D4BC4C;
+    background-color:#F9F6E7;
+}
+
+
 .alert.inline {
     background-color: #fff;
     text-align: center;
@@ -451,8 +457,8 @@ input, button { -webkit-appearance: button;}
 .tabs {
     margin-top: 11px;
     padding-bottom: 11px;
-	overflow-x: scroll;
-	white-space: nowrap;
+    overflow-x: scroll;
+    white-space: nowrap;
 }
 
 .tabs > .selector > .tab-select {
@@ -758,24 +764,24 @@ img.rounded, .post > .author > .ava {
     /* папапепе гемабоди) */
     
     .navigation {
-		pointer-events:none !important;
-		position: fixed;
-		width: 866px;
-	}
-	.app,
-	h2 {
-		min-width:864px;
-		max-width:45%;
-		border-right:none;
-		border-bottom:0px solid #dee5eb
-	}
-	.menuovk {
-		background:#fff;
-		width:288px !important;
-		display:block !important;
-		top: 48px;
-		position: absolute;
-	}
+        pointer-events:none !important;
+        position: fixed;
+        width: 866px;
+    }
+    .app,
+    h2 {
+        min-width:864px;
+        max-width:45%;
+        border-right:none;
+        border-bottom:0px solid #dee5eb
+    }
+    .menuovk {
+        background:#fff;
+        width:288px !important;
+        display:block !important;
+        top: 48px;
+        position: absolute;
+    }
 
     .profile_menu_arrow{
        position: inherit;
@@ -792,7 +798,7 @@ img.rounded, .post > .author > .ava {
     z-index:1337;
     right: 0;
     top: 0;
-	pointer-events: all !important;
+    pointer-events: all !important;
     }
     
     .head_now{
@@ -862,9 +868,9 @@ img.rounded, .post > .author > .ava {
 .menunameava .pr_ovk_page .status {
     color: #797979;
     font-size: 14px;
-	overflow: hidden;
-	max-width:200px;
-	text-overflow: ellipsis;
+    overflow: hidden;
+    max-width:200px;
+    text-overflow: ellipsis;
 }
 /* Подписывайтесь на мой YouTube: youtube.com/DanielM */
 
@@ -1047,7 +1053,7 @@ img.rounded, .post > .author > .ava {
 .content_post {
     padding: 12px;
     padding-top: 2px;
-	background: #fff;
+    background: #fff;
 }
 .post {
     margin-top: 10px;
@@ -1119,19 +1125,19 @@ img.rounded, .post > .author > .ava {
     margin-top: 19px;
     font-weight: bold;
     margin-left: 5px;
-	text-overflow:ellipsis;
-	white-space:nowrap;
-	overflow:hidden;
-	max-width: 55%;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    overflow:hidden;
+    max-width: 55%;
 }
 
 .video_desc{
-	text-overflow:ellipsis;
-	white-space:nowrap;
-	overflow:hidden;
-	max-width: 55%;
-	display: block;
-	max-height: 75px;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    overflow:hidden;
+    max-width: 55%;
+    display: block;
+    max-height: 75px;
 }
 
 .profile_link_form {
@@ -1506,6 +1512,10 @@ h4 {
     background-position: 0px -332px;
 }
 
+#notfg{
+    background-position: 0px -392px;
+}
+
 .element.prmenu.gray a {
     font-size: 16px;
     font-weight: normal;
@@ -1735,7 +1745,7 @@ input[type~="search"]{
     background: #fff;
 }
 
-.attach_menu_ph{
+.attach_menu_ph {
     text-align:left;
     background-color: transparent;
     display: block;
@@ -1750,6 +1760,19 @@ input[type~="search"]{
     padding: 0px;
 }
 
+.attach_menu_video {
+    background-color: transparent;
+    display: block;
+    float: right;
+    position: inherit;
+    background-image: url('/themepack/mobile_ovk/0.0.1.0/resource/ovk_attach.png');
+    width: 32px;
+    height: 32px;
+    background-position: -350px 50%;
+    background-repeat: no-repeat;
+    margin: -12px 0px 0px 0px;
+    padding: 0px;
+}
 
 .avatar-list-item {
     padding: 4px 0;
@@ -1864,7 +1887,7 @@ input[type~="search"]{
     font-weight: bold;
     border: 1px solid #d7cf9e;
     border-bottom: 0;
-	font-size: 14px;
+    font-size: 14px;
 }
 
 #faqcontent {
@@ -1872,19 +1895,19 @@ input[type~="search"]{
     margin: 0 5px 10px;
     padding: 5px 5px 5px 10px;
     border: 1px solid #ddd;
-	font-size: 12px;
+    font-size: 12px;
 }
 
 .s_text{
-	font-size: 14px;
-	margin: 3px;
+    font-size: 14px;
+    margin: 3px;
 }
 
 .s_post-author{
-	font-size: 14px;
+    font-size: 14px;
 }
 .knowledgeBaseArticle{
-	padding: 5px;
+    padding: 5px;
 }
 
 .alert.fake {
@@ -1902,7 +1925,7 @@ input[type~="search"]{
     padding: 8px;
     transition: .1s filter ease-in;
     border: 1px solid #e3e3e3;
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 
 .poll-embed {
@@ -1916,8 +1939,8 @@ input[type~="search"]{
 
 .poll-meta .nobold {
     font-style: oblique;
-	font-size: 12px;
-	color: gray;
+    font-size: 12px;
+    color: gray;
 }
 
 .poll-result-barspace {
@@ -1967,7 +1990,7 @@ a.poll-retract-vote {
 }
 
 label, .poll > input[type=checkbox]{
-	background-color: transparent;
+    background-color: transparent;
     border: none;
     border-radius: 0;
     -moz-appearance: none;
@@ -1977,11 +2000,11 @@ label, .poll > input[type=checkbox]{
     outline: none;
     cursor: pointer;
     vertical-align: middle;
-	margin-top: 0%;
+    margin-top: 0%;
 }
 
 .poll-option{
-	padding: 5px;
+    padding: 5px;
 }
 
 .completeness-gauge {
@@ -2018,6 +2041,19 @@ label, .poll > input[type=checkbox]{
   margin-left: 5px;
 }
 
+.youtube_video_block {
+    margin-bottom: 10px;
+    position: relative;
+}
+
+.youtube_button {
+    z-index: 555;
+    position: absolute;
+    margin: auto;
+    position: absolute;
+    top: 0; left: 0; bottom: 0; right: 0;
+}
+
 /* IE 10+ styles only for necrobrowsers */
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
     .navigation {
@@ -2048,3 +2084,42 @@ label, .poll > input[type=checkbox]{
         margin-top: 45px;
     }
 }
+
+.note_attachment {
+    background-color: #E6E6E6;
+    margin-bottom: 5px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    display: flex;
+}
+
+.note_icon {
+    max-width: 30px;
+    margin-left: 10px;
+}
+
+.note_name {
+    margin-left: 5px;
+    color: #636466;
+    font-family: tahoma, verdana, arial, sans-serif;
+}
+
+.note_attachment:hover {
+    background-color: #ecebeb;
+}
+
+.note_attachment:active {
+    background-color: #cecece;
+}
+
+.mobile_repost {
+    background:#E6E6E6;
+    color: #636466;
+    font-size: 18px;
+    width: 300px;
+    padding: 5px;
+}
+
+.note_title a {
+    font-size: 20px;
+}
\ No newline at end of file
diff --git a/tpl/@layout.xml b/tpl/@layout.xml
index 4282aff..046b5a3 100755
--- a/tpl/@layout.xml
+++ b/tpl/@layout.xml
@@ -14,6 +14,9 @@
 
         <link rel="stylesheet" href="/themepack/mobile_ovk/0.0.1.0/stylesheet/styles.css?v={time()}" />
         <link rel="stylesheet" href="/themepack/mobile_ovk/0.0.1.0/resource/vendor/pure-grid.css" />
+        <script src="/language/{php echo getLanguage()}.js" crossorigin="anonymous"></script>
+        {script "js/l10n.js"}
+
         {ifset headIncludes}{include headIncludes}{/ifset}
         <script src="/themepack/mobile_ovk/0.0.1.0/resource/jquery-3.6.0.min.js"></script>
         <script defer src="/themepack/mobile_ovk/0.0.1.0/resource/menu.js"></script>
@@ -85,6 +88,9 @@
                     <li class="element prmenu">
                         <a n:if="$thisUser->getLeftMenuItemStatus('videos')" href="/videos{$thisUser->getId()}"><div class="mobile_icons" id="video">{_mobile_videos} </div></a>
                     </li>
+                    <li class="element prmenu">
+                        <a n:if="$thisUser->getLeftMenuItemStatus('notes')" href="/notes{$thisUser->getId()}"><div class="mobile_icons" id="notfg">{_mobile_notes} </div></a>
+                    </li>
                     <!-- li class="element prmenu">
                         <a n:if="$thisUser->getLeftMenuItemStatus('audios')" href="/audios{$thisUser->getId()}"><div class="mobile_icons" id="music">Аудиозаписи </div></a>
                     </li -->
diff --git a/tpl/Group/Edit.xml b/tpl/Group/Edit.xml
new file mode 100644
index 0000000..6944a43
--- /dev/null
+++ b/tpl/Group/Edit.xml
@@ -0,0 +1,87 @@
+{extends "../@layout.xml"}
+{block title}{_edit_group}{/block}
+
+{block titleHeader}
+    <a href="{$club->getURL()}">{$club->getName()}</a> » {_edit_group}
+{/block}
+
+{block body}
+    <div class="tabs">
+        <div id="activetabs" class="tab">
+            <a id="act_tab_a" href="javascript:void(0)">
+                {_main}
+            </a>
+        </div>
+        <div class="tab">
+            <a href="/club{$club->getId()}/backdrop">
+                {_backdrop_short}
+            </a>
+        </div>
+        <div class="tab">
+            <a href="/club{$club->getId()}/followers">
+                {_followers}
+            </a>
+        </div>
+    </div>
+    
+    <div class="container_gray">
+        <h4>{_main_information}</h4>
+        <form method="POST" enctype="multipart/form-data">
+            <style>
+                input[type=text] {
+                    width: 100%;
+                }
+            </style>
+                    <div class="formInput">
+                        <span class="nobold">{_name}: </span>
+                        <input type="text" name="name" value="{$club->getName()}" />
+                    </div>
+                    <div class="formInput">
+                        <span class="nobold">{_description}: </span>
+                        <textarea type="text" name="about" style="resize:vertical;">{$club->getDescription()}</textarea>
+                    </div>
+                    <div class="formInput">
+                        <span class="nobold">{_page_address}: </span>
+                        <input type="text" name="shortcode" value="{$club->getShortcode()}" />
+                    </div>
+                    <div class="formInput">
+                        <span class="nobold">{_website}: </span>
+                        <input type="text" name="website" value="{$club->getWebsite()}" />
+                    </div>
+                    <div class="formInput">
+                        <span class="nobold">{_avatar}: </span>
+                        <input type="file" id="ava" value="{_browse}" name="ava" onchange="filename.innerHTML=ava.files[0].name" />
+                        <div id="filename" style="margin-top: 10px;"></div>
+                    </div>
+                    <div class="formInput">
+                        <span class="nobold">{_wall}: </span><br />
+                        <br /><input type="checkbox" name="wall" value="1" n:attr="checked => $club->canPost()" /> {_group_allow_post_for_everyone}<br>
+                        <br /><input type="checkbox" name="hide_from_global_feed" value="1" n:attr="checked => $club->isHideFromGlobalFeedEnabled()" /> {_group_hide_from_global_feed}<br />
+                    </div>
+                    <div class="formInput">
+                        <span class="nobold">{_discussions}: </span><br />
+                        <br /><input type="checkbox" name="everyone_can_create_topics" value="1" n:attr="checked => $club->isEveryoneCanCreateTopics()" /> {_everyone_can_create_topics}<br>
+                        <br /><input type="checkbox" name="display_topics_above_wall" value="1" n:attr="checked => $club->isDisplayTopicsAboveWallEnabled()" /> {_display_list_of_topics_above_wall}<br />
+                    </div>
+                    <div class="formInput">
+                        <span class="nobold">{_group_administrators_list}: </span><br />
+                        {var $areAllAdminsHidden = $club->getManagersCount(true) == 0}
+                        <br /><input type="radio" name="administrators_list_display" value="0" n:attr="checked => $club->getAdministratorsListDisplay() == 0, disabled => $areAllAdminsHidden" /> {_group_display_only_creator}<br>
+                        <br /><input type="radio" name="administrators_list_display" value="1" n:attr="checked => $club->getAdministratorsListDisplay() == 1, disabled => $areAllAdminsHidden" /> {_group_display_all_administrators}<br>
+                        <br /><input type="radio" name="administrators_list_display" value="2" n:attr="checked => $club->getAdministratorsListDisplay() == 2" /> {_group_dont_display_administrators_list}<br><br />
+                    </div>
+
+                    <tr>
+                        <td>
+                            
+                        </td>
+                        <td>
+                            <input type="hidden" name="hash" value="{$csrfToken}" />
+                            <input type="submit" value="{_save}" class="button" />
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </form>
+    </div>
+{/block}
diff --git a/tpl/Group/EditBackdrop.xml b/tpl/Group/EditBackdrop.xml
new file mode 100644
index 0000000..52de044
--- /dev/null
+++ b/tpl/Group/EditBackdrop.xml
@@ -0,0 +1,32 @@
+{extends "../@layout.xml"}
+{var $backdrops = $club->getBackDropPictureURLs()}
+
+{block title}{$club->getName()} | {_backdrop}{/block}
+
+{block titleHeader}
+<a href="{$club->getURL()}">{$club->getName()}</a> » {_backdrop}
+{/block}
+
+{block body}
+    <div class="tabs">
+        <div class="tab">
+            <a href="/club{$club->getId()}/edit">
+                {_main}
+            </a>
+        </div>
+        <div id="activetabs" class="tab">
+            <a id="act_tab_a" href="/club{$club->getId()}/backdrop">
+                {_backdrop_short}
+            </a>
+        </div>
+        <div class="tab">
+            <a href="/club{$club->getId()}/followers">
+                {_followers}
+            </a>
+        </div>
+    </div>
+
+    <div class="container_gray">
+        can't
+    </div>
+{/block}
diff --git a/tpl/Group/Followers.xml b/tpl/Group/Followers.xml
new file mode 100644
index 0000000..7032576
--- /dev/null
+++ b/tpl/Group/Followers.xml
@@ -0,0 +1,53 @@
+{extends "../@listView.xml"}
+{var $Manager = openvk\Web\Models\Entities\Manager::class}
+{var $iterator = $onlyShowManagers ? $managers : $followers}
+{var $count    = $paginatorConf->count}
+{var $page     = $paginatorConf->page}
+{var $perPage  = 6}
+
+{block title}{_followers} {$club->getCanonicalName()}{/block}
+
+{block titleHeader}
+    <a href="{$club->getURL()}">{$club->getCanonicalName()}</a>
+    » {_followers}
+    <a n:if="!$onlyShowManagers" href="/club{$club->getId()}/followers?onlyAdmins=1" style="float: right;">{_all_followers}</a>
+    <a n:if="$onlyShowManagers" href="/club{$club->getId()}/followers" style="float: right;">{_only_administrators}</a>
+{/block}
+
+{* BEGIN ELEMENTS DESCRIPTION *}
+
+{block tabs}
+    {if $club->canBeModifiedBy($thisUser)}
+        <div class="tab">
+            <a href="/club{$club->getId()}/edit">
+                {_main}
+            </a>
+        </div>
+        <div class="tab">
+            <a href="/club{$club->getId()}/backdrop">
+                {_backdrop_short}
+            </a>
+        </div>
+        <div id="activetabs" class="tab">
+            <a id="act_tab_a" href="/club{$club->getId()}/followers">
+                {_followers}
+            </a>
+        </div>
+    {/if}
+{/block}
+
+{block link|strip|stripHtml}
+    /id{$x instanceof $Manager ? $x->getUserId() : $x->getId()}
+{/block}
+
+{block preview}
+    <img src="{$x instanceof $Manager ? $x->getUser()->getAvatarURL() : $x->getAvatarURL('miniscule')}" alt="{$x instanceof $Manager ? $x->getUser()->getCanonicalName() : $x->getCanonicalName()}" width=75 />
+{/block}
+
+{block name}
+    {$x instanceof $Manager ? $x->getUser()->getCanonicalName() : $x->getCanonicalName()}
+{/block}
+
+{block description}
+    
+{/block}
\ No newline at end of file
diff --git a/tpl/Group/View.xml b/tpl/Group/View.xml
index 5541f92..8449572 100755
--- a/tpl/Group/View.xml
+++ b/tpl/Group/View.xml
@@ -56,6 +56,10 @@
                 </div>
             </div>
             
+            {if isset($thisUser) && $club->canBeModifiedBy($thisUser)}
+                <a href="/club{$club->getId()}/edit"><input type="submit" class="button primary big max" value="{_edit_group}" /></a>
+            {/if}
+
             {ifset $thisUser}
                 {if $club->getSubscriptionStatus($thisUser) == false}
                 <form action="/setSub/club" method="post" class="form_gr">
@@ -101,19 +105,19 @@
         </div> -->
         
         <div class="contentWrap">
-            <div class="legend">
+            <div class="legend" n:if="!is_null($club->getDescription()) || !is_null($club->getWebsite())">
                 <span>{_information}</span>
             </div>
             
-            <div class="content">
+            <div class="content" n:if="!is_null($club->getDescription()) || !is_null($club->getWebsite())">
                 <table class="ugc-table">
                     <tbody>
-                        <tr>
-                            <td><span class="text-gray">Описаниe: </span></td>
+                        <tr n:if="!is_null($club->getDescription())">
+                            <td><span class="text-gray">{_description}: </span></td>
                             <td>{$club->getDescription()}</td>
                         </tr>
-                        <tr>
-                            <td><span class="text-gray">Сайт: </span></td>
+                        <tr n:if="!is_null($club->getWebsite())">
+                            <td><span class="text-gray">{_website}: </span></td>
                             <td>
                                 <a href="{$club->getWebsite()}" rel="ugc" target="_blank">
                                     {$club->getWebsite()}
@@ -132,16 +136,21 @@
             
             <div class="content">
                 <ul class="menu">
-                            <li class="element">
-                                <a href="/club{$club->getId()}/followers">
-                                    {_participants}
-                                    <span class="counter">{$club->getFollowersCount()}</span>
-                                </a>
-                            </li>
+                    <li class="element">
+                        <a href="/club{$club->getId()}/followers">
+                            {_participants}
+                            <span class="counter">{$club->getFollowersCount()}</span>
+                        </a>
+                    </li>
+                    <li class="element">
+                        <a href="/board{$club->getId()}">
+                            {_topics}
+                        </a>
+                    </li>
                 </ul>
             </div>
                 {presenter "openvk!Wall->wallEmbedded", -$club->getId()}
         </div>
     </div>
-    
+
 {/block}
diff --git a/tpl/Notes/Create.xml b/tpl/Notes/Create.xml
new file mode 100644
index 0000000..3e0b78c
--- /dev/null
+++ b/tpl/Notes/Create.xml
@@ -0,0 +1,58 @@
+{extends "../@layout.xml"}
+
+{block title}{_create_note}{/block}
+
+{block titleHeader}
+    {_create_note}
+{/block}
+
+{block body}
+    <form id="noteFactory" method="POST">
+        <input type="text" name="name" placeholder="{_name_note}" style="width: 100%;margin-top: 10px;" />
+        <br/><br/>
+        <textarea name="html" style="display:none;"></textarea>
+        <div id="editor" style="width:100%;height:300px;border:1px solid grey"></div>
+        
+        <p style="margin-left:10px;"><i><a href="/kb/notes">Кое-что</a> из (X)HTML поддерживается.</i></p>
+        
+        <input type="hidden" name="hash" value="{$csrfToken}" />
+        <button class="button" style="margin-left:10px;">{_save}</button>
+        <a href="javascript:openPreviewWindow()" style="float: right;margin-right:10px">{_note_preview}</a>
+    </form>
+    
+    {script "js/node_modules/monaco-editor/min/vs/loader.js"}
+    {script "js/node_modules/requirejs/bin/r.js"}
+    <script>
+        require.config({
+            paths: {
+                'vs': '/assets/packages/static/openvk/js/node_modules/monaco-editor/min/vs' 
+            }
+        });
+        require(['vs/editor/editor.main'], function() {
+            window._editor = monaco.editor.create(document.getElementById('editor'), {
+                value: "",
+                lineNumbers: "off",
+                language: "html"
+            });
+        });
+        
+        document.querySelector("#noteFactory").addEventListener("submit", function() {
+            document.querySelector("textarea").value = window._editor.getValue();
+        });
+
+        window._preview = undefined;
+        function openPreviewWindow() {
+            if(typeof window._preview != "undefined") {
+                window._preview.close();
+                window._preview = undefined;
+            }
+
+            window._preview = window.open("about:blank", "_blank", { popup: true });
+            window._preview.document.write(`<style>form { display: none; }</style><form action="${ location.origin }/notes/prerender" method="POST" enctype="multipart/form-data"><input name="title" /><input name="html" /><input name="hash" /></form>`);
+            window._preview.document.querySelector("input[name=title]").value = document.querySelector("input[name=name]").value;
+            window._preview.document.querySelector("input[name=html]").value = window._editor.getValue();
+            window._preview.document.querySelector("input[name=hash]").value = document.querySelector("meta[name=csrf]").attributes.value.value;
+            window._preview.document.querySelector("form").submit();
+        }
+    </script>
+{/block}
diff --git a/tpl/Notes/Edit.xml b/tpl/Notes/Edit.xml
new file mode 100644
index 0000000..7e66ae7
--- /dev/null
+++ b/tpl/Notes/Edit.xml
@@ -0,0 +1,48 @@
+{extends "../@layout.xml"}
+
+{block title}{_edit_note}{/block}
+
+{block titleHeader}
+    {var $author = $note->getOwner()}
+    <a href="{$author->getURL()}">{$author->getCanonicalName()}</a>
+    »
+    <a href="/notes{$author->getId()}">{_notes}</a>
+    »
+    <a href="/note{$author->getId()}_{$note->getVirtualId()}">{$note->getName()}</a>
+{/block}
+
+{block body}
+    <form id="noteFactory" method="POST">
+        <input type="text" name="name" placeholder="{_name_note}" style="width: 100%;margin-top: 10px;" value="{$note->getName()}" />
+        <br/><br/>
+        <textarea name="html" style="display:none;"></textarea>
+        <div id="editor" style="width:100%;height:300px;border:1px solid grey"></div>
+        
+        <p><i><a href="/kb/notes">Кое-что</a> из (X)HTML поддерживается.</i></p>
+        
+        <input type="hidden" name="hash" value="{$csrfToken}" />
+        <button class="button">{_save}</button>
+        <input onclick="location.href = '/note{$note->getOwner()->getId()}_{$note->getVirtualId()}'"  type="button" class="button" value="{_cancel}">
+    </form>
+    
+    {script "js/node_modules/monaco-editor/min/vs/loader.js"}
+    {script "js/node_modules/requirejs/bin/r.js"}
+    <script>
+        require.config({
+            paths: {
+                'vs': '/assets/packages/static/openvk/js/node_modules/monaco-editor/min/vs' 
+            }
+        });
+        require(['vs/editor/editor.main'], function() {
+            window._editor = monaco.editor.create(document.getElementById('editor'), {
+                value: {$note->getSource()},
+                lineNumbers: "off",
+                language: "html"
+            });
+        });
+        
+        document.querySelector("#noteFactory").addEventListener("submit", function() {
+            document.querySelector("textarea").value = window._editor.getValue();
+        });
+    </script>
+{/block}
diff --git a/tpl/Notes/List.xml b/tpl/Notes/List.xml
new file mode 100644
index 0000000..1e18367
--- /dev/null
+++ b/tpl/Notes/List.xml
@@ -0,0 +1,69 @@
+{extends "../@layout.xml"}
+{var $iterator = iterator_to_array($notes)}
+{var $page     = $paginatorConf->page}
+
+{block title}{_notes}{/block}
+
+{block titleHeader}
+        {if isset($thisUser) && $thisUser->getId() == $owner->getId()}
+            {_my_notes}
+        {else}
+            <a href="{$owner->getURL()}">
+            {$owner->getCanonicalName()}</a>
+            »
+            {_notes}
+        {/if}
+{/block}
+
+{block actions}
+    
+{/block}
+
+{* BEGIN ELEMENTS DESCRIPTION *}
+
+{block body}
+
+    <div class="container_gray" style="background: white; border-top: none;">
+        <div style="padding-bottom: 0px; padding-top: 0;" class="summaryBar">
+            <div class="summary" style="padding-bottom:5px">
+                    <span n:if="isset($thisUser) && $thisUser->getId() == $owner->getId()" style="float:right;">
+                        <a href="/notes/create">
+                            <input type="button" value="{_create_note}">
+                            
+                        </a>
+                    </span>
+            </div>
+        </div>
+        {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
+        {if sizeof($data) > 0}
+
+        <div n:foreach="$data as $dat" style="margin-left:10px;" onclick="location.href = '/note'+{$dat->getPrettyId()}">
+            <article class="note_body list_w_link" id="userContent" style="width: 540px; display: inline-block; margin-bottom: 35px;">
+                <div class="note_header">
+                    <div class="note_title">
+                        <div class="note_title">
+                            <a href="/note{$dat->getPrettyId()}">{$dat->getName()}</a>
+                        </div>
+                    </div>
+                </div>
+                <div style="margin-left: 6px;">
+                    {$dat->getText(750)|noescape}
+                </div>
+            </article>    
+        </div>      
+
+        {else}
+            {if isset($thisUser) && $thisUser->getId() == $owner->getId()}
+
+                <div style="padding: 10px 20px 20px;"><h4 style="border: none;padding-bottom: 5px;">{_welcome}</h4>{_notes_start_screen}</div>
+            
+            {else}
+                {ifset customErrorMessage}
+                    {include ../customErrorMessage}
+                {else}
+                    {include ../components/nothing.xml}
+                {/ifset}
+            {/if}
+        {/if} 
+    </div>
+{/block}
\ No newline at end of file
diff --git a/tpl/Notes/PreView.xml b/tpl/Notes/PreView.xml
new file mode 100644
index 0000000..4f80214
--- /dev/null
+++ b/tpl/Notes/PreView.xml
@@ -0,0 +1,37 @@
+{extends "../@layout.xml"}
+
+{block title}
+    {$title}
+{/block}
+
+{block header}
+    {$title}
+{/block}
+
+{block content}
+    <style>
+        .sidebar {
+            display: none;
+        }
+
+        .page_header {
+            display: none;
+        }
+
+        .page_content {
+            display: unset;
+            width: unset;
+        }
+
+        .page_body {
+            width: unset;
+            float: unset;
+        }
+
+        .page_footer {
+            display: none;
+        }
+    </style>
+
+    {$html|noescape}
+{/block}
diff --git a/tpl/Notes/View.xml b/tpl/Notes/View.xml
new file mode 100644
index 0000000..5bba736
--- /dev/null
+++ b/tpl/Notes/View.xml
@@ -0,0 +1,79 @@
+{extends "../@layout.xml"}
+
+{block title}{$note->getName()}{/block}
+
+{block titleHeader}
+    {var $author = $note->getOwner()}
+    <a href="{$author->getURL()}">{$author->getCanonicalName()}</a>
+    »
+    <a href="/notes{$author->getId()}">{_notes}</a>
+    »
+    {$note->getName()}
+{/block}
+
+{block body}
+    {var $author = $note->getOwner()}
+    <style>
+        #userContent img {
+            max-width: 245pt;
+            max-height: 200pt;
+        }
+
+        #userContent blockquote {
+            background-color: #f3f3f3;
+            border-bottom: 5px solid #969696;
+            padding: 1;
+        }
+
+        #userContent cite {
+            margin-top: 1em;
+            display: block;
+        }
+
+        #userContent cite::before {
+            content: "— ";
+        }
+
+        #userContent .underline {
+            text-decoration: underline;
+        }
+    </style>
+
+    <article id="userContent" style="margin: 10px 10px 0;">
+        <div class="note_header">
+            <div class="note_title">
+                <div class="note_title">
+                    <a>{$note->getName()}</a>
+                </div>
+            </div>
+            <div class="byline">
+                <span><a href="{$author->getURL()}">{$author->getCanonicalName()}</a></span> {$note->getPublicationTime()}
+                <span n:if="$note->getEditTime() > $note->getPublicationTime()">({_edited} {$note->getEditTime()})</span>
+            </div>
+        </div>
+        <div style="margin-left: 6px; width: 535px;">
+            {$note->getText()|noescape}
+        </div>
+    </article>
+
+    <div class="note_footer" style="margin: 10px 10px 0;">
+        <div class="comments_count">
+            <span n:if="isset($thisUser) && $thisUser->getId() === $note->getOwner()->getId()">
+                <a href="/note{$note->getOwner()->getId()}_{$note->getVirtualId()}/edit"><input type="button" class="button" value="{_edit}"></a>
+            </span>
+            
+            <a data-id="{$thisUser->getId()}" id="_noteDelete" href="/note{$note->getOwner()->getId()}_{$note->getId()}/delete">
+                <input type="button" value="{_delete}">
+            </a>
+        </div>
+    </div>
+    <div style="margin: 6px 10px 10px;border-top: 1px solid #ddd;">
+        {include "../components/comments.xml",
+            comments => $comments,
+            count => $cCount,
+            page => $cPage,
+            model => "notes",
+            parent => $note,
+            showTitle => false}
+    </div>
+{/block}
\ No newline at end of file
diff --git a/tpl/Search/Index.xml b/tpl/Search/Index.xml
index d6e31e8..a1d4516 100755
--- a/tpl/Search/Index.xml
+++ b/tpl/Search/Index.xml
@@ -1,4 +1,4 @@
-{extends "../@listView.xml"}
+{extends "../@layout.xml"}
 
 {block title}
     {if $type === "users"}
@@ -8,8 +8,8 @@
     {/if}
 {/block}
 
-{block header}
-
+{block titleHeader}
+    {_header_search}
 {/block}
 
 
@@ -19,18 +19,35 @@
 
 
 {block tabs}
-    <div {if $type === "users"}id="activetabs"{/if} class="tab">
-        <a {if $type === "users"}id="act_tab_a"{/if} href="/search?type=users">
-            {_users}
-        </a>
-    </div>
-    <div {if $type === "groups"}id="activetabs"{/if} class="tab">
-        <a {if $type === "groups"}id="act_tab_a"{/if} href="/search?type=groups">
-            {_groups}
-        </a>
+    <div style="padding:10px">
+        <div {if $type === "users"}id="activetabs"{/if} class="tab">
+            <a {if $type === "users"}id="act_tab_a"{/if} href="/search?type=users">
+                {_users}
+            </a>
+        </div>
+        <div {if $type === "groups"}id="activetabs"{/if} class="tab">
+            <a {if $type === "groups"}id="act_tab_a"{/if} href="/search?type=groups">
+                {_groups}
+            </a>
+        </div>
+        <div {if $type === "posts"}id="activetabs"{/if} class="tab">
+            <a {if $type === "posts"}id="act_tab_a"{/if} href="/search?type=posts">
+                {_s_posts}
+            </a>
+        </div>
+        <div {if $type === "comments"}id="activetabs"{/if} class="tab">
+            <a {if $type === "comments"}id="act_tab_a"{/if} href="/search?type=comments">
+                {_s_comments}
+            </a>
+        </div>
+        <div {if $type === "videos"}id="activetabs"{/if} class="tab">
+            <a {if $type === "videos"}id="act_tab_a"{/if} href="/search?type=videos">
+                {_s_videos}
+            </a>
+        </div>
     </div>
 
-    <div class="sr_padding">
+    <div class="sr_padding" style="margin-left:10px">
         <form class="header_search_inputbt">
             <input name="type" type="hidden" value="{$type ?? 'users'}" />
             <input name="query" class="sr_input" placeholder="{_header_search}" value="{$_GET['query'] ?? ''}" />
@@ -39,6 +56,84 @@
     </div>
 {/block}
 
+{block body}
+    {include tabs}
+    <p style="margin-left: 15px; margin-top: 0;">
+        <b>{tr("results", $count)}</b>
+    </p>
+    <div>
+
+    {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
+    <div class="container_gray borderup">
+        {if sizeof($data) > 0}
+            {if $type == "users" || $type == "groups" || $type == "apps"}
+                <div class="content" n:foreach="$data as $dat">
+                    <table>
+                    <tbody>
+                        <tr>
+                            <td valign="top">
+                                <a href="{include link, x => $dat}">
+                                {include preview, x => $dat}
+                                </a>
+                            </td>
+                            <td valign="top" style="width: 100%">
+                                {ifset infotable}
+                                    {include infotable, x => $dat}
+                                {else}
+                                    <a href="{include link, x => $dat}">
+                                    <b>
+                                        {include name, x => $dat}
+                                    </b>
+                                    </a>
+                                    <br/>
+                                    {include description, x => $dat}
+                                    {/ifset}
+                            </td>
+                            <td n:ifset="actions" valign="top" class="action_links" style="width: 150px;">
+                                {include actions, x => $dat}
+                            </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            {elseif $type == "posts"}
+                <div n:foreach="$data as $dat" class="content">
+                    {if $dat->getTargetWall() < 0 && $dat->getWallOwner()->isHideFromGlobalFeedEnabled()}
+                        brbrevht
+                    {else}
+                        {include "../components/post.xml", post => $dat, commentSection => true, onWallOf => true}
+                    {/if}
+                </div>
+            {elseif $type == "comments"}
+                <div n:foreach="$data as $dat" class="content">
+                    {include "../components/comment.xml", comment => $dat, linkW => true}
+                </div>
+            {elseif $type == "videos"}
+                {foreach $data as $dat}
+                    <div class="content">
+                        {include "../components/video.xml", video => $dat}
+                    </div>
+                {/foreach}
+            {elseif $type == "audios"}
+                privet
+            {/if}
+            {include "../components/paginator.xml", conf => (object) [
+                "page"     => $page,
+                "count"    => $count,
+                "amount"   => sizeof($data),
+                "perPage"  => $perPage ?? OPENVK_DEFAULT_PER_PAGE,
+                "atBottom" => false,
+            ]}
+        {else}
+            {ifset customErrorMessage}
+                {include customErrorMessage}
+            {else}
+                {include "../components/nothing.xml"}
+            {/ifset}
+        {/if}
+    </div>
+{/block}
+
 {block link|strip|stripHtml}
     {$x->getURL()}
 {/block}
diff --git a/tpl/Topics/Board.xml b/tpl/Topics/Board.xml
new file mode 100644
index 0000000..26870c5
--- /dev/null
+++ b/tpl/Topics/Board.xml
@@ -0,0 +1,56 @@
+{extends "../@listView.xml"}
+{var $iterator = iterator_to_array($topics)}
+{var $page     = $paginatorConf->page}
+
+{block title}{_discussions} {$club->getCanonicalName()}{/block}
+
+{block titleHeader}
+    <a href="{$club->getURL()}">{$club->getCanonicalName()}</a> » {_discussions}
+    
+    <div n:if="$club->isEveryoneCanCreateTopics() || $club->canBeModifiedBy($thisUser)" style="float: right;">
+        <a href="/board{$club->getId()}/create">{_create_topic}</a>
+    </div>
+{/block}
+
+{block tabs}
+    <p>
+        {tr("results", $count)}
+    </p>
+{/block}
+
+{block actions}
+    
+{/block}
+
+{* BEGIN ELEMENTS DESCRIPTION *}
+
+{block link|strip|stripHtml}
+    /topic{$x->getPrettyId()}
+{/block}
+
+{block preview}
+
+{/block}
+
+{block name}
+    {$x->getTitle()}
+    <div n:if="$x->isPinned()" class="pinned-mark"></div>
+{/block}
+
+{block description}
+    <div style="float: left;">
+        {tr("messages", $x->getCommentsCount())}
+    </div>
+    {var $lastComment = $x->getLastComment()}
+    <div n:if="$lastComment" class="avatar-list-item" style="float: right;">
+        <div class="avatar">
+            <a href="{$lastComment->getOwner()->getURL()}">
+                <img class="ava" src="{$lastComment->getOwner()->getAvatarUrl()}" />
+            </a>
+        </div>
+        <div class="info">
+            <a href="{$lastComment->getOwner()->getURL()}" class="title">{$lastComment->getOwner()->getCanonicalName()}</a>
+            <div class="subtitle">{_replied} {$lastComment->getPublicationTime()}</div>
+        </div>
+    </div>
+{/block}
diff --git a/tpl/Topics/Create.xml b/tpl/Topics/Create.xml
new file mode 100644
index 0000000..84b17f2
--- /dev/null
+++ b/tpl/Topics/Create.xml
@@ -0,0 +1,73 @@
+{extends "../@layout.xml"}
+{block title}{_new_topic}{/block}
+
+{block titleHeader}
+    <a href="{$club->getURL()}">{$club->getCanonicalName()}</a>
+    » 
+    <a href="/board{$club->getId()}">{_discussions}</a>
+    » 
+    {_new_topic}
+{/block}
+
+{block body}
+    <form method="POST" enctype="multipart/form-data">
+        <table cellspacing="7" cellpadding="0" width="80%" border="0" align="center">
+            <tbody>
+                <tr>
+                    <td width="120" valign="top">
+                        <span class="nobold">{_title}</span>
+                    </td>
+                    <td>
+                        <input type="text" name="title" style="width: 100%;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td width="120" valign="top">
+                        <span class="nobold">{_text}</span>
+                    </td>
+                    <td>
+                        <textarea id="wall-post-input1" name="text" style="width: 100%; resize: none;"></textarea>
+                        <div n:if="$club->canBeModifiedBy($thisUser)" class="post-opts">
+                            <label>
+                                <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" /> {_post_as_group}
+                            </label>
+                        </div>
+                        <div id="post-buttons1">
+                            <input type="file" class="postFileSel" id="postFilePic" name="_pic_attachment" accept="image/*" style="display: none;" />
+                            <input n:if="!OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading']" type="file" class="postFileSel" id="postFileVid" name="_vid_attachment" accept="video/*" style="display: none;" />
+                            <br/>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        
+                    </td>
+                    <td>
+                        <input type="hidden" name="hash" value="{$csrfToken}" />
+                        <input type="submit" value="{_create_topic}" class="button" />
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+        <input type="hidden" name="hash" value="{$csrfToken}" />
+    </form>
+
+    <script>
+        $(document).ready(() => {
+            u("#post-buttons1 .postFileSel").on("change", function() {
+                handleUpload.bind(this, 1)();
+            });
+
+            setupWallPostInputHandlers(1);
+        });
+    </script>
+
+    {if $graffiti}
+        {script "js/node_modules/react/dist/react-with-addons.min.js"}
+        {script "js/node_modules/react-dom/dist/react-dom.min.js"}
+        {script "js/vnd_literallycanvas.js"}
+        {css "js/node_modules/literallycanvas/lib/css/literallycanvas.css"}
+    {/if}
+{/block}
diff --git a/tpl/Topics/Edit.xml b/tpl/Topics/Edit.xml
new file mode 100644
index 0000000..3036d5a
--- /dev/null
+++ b/tpl/Topics/Edit.xml
@@ -0,0 +1,55 @@
+{extends "../@layout.xml"}
+{block title}{_edit_topic} "{$topic->getTitle()}"{/block}
+
+{block titleHeader}
+    <a href="{$club->getURL()}">{$club->getCanonicalName()}</a>
+    » 
+    <a href="/board{$club->getId()}">{_discussions}</a>
+    » 
+    {_edit_topic}
+{/block}
+
+{block body}
+    <div class="container_gray">
+        <b>{$topic->getTitle()}</b>
+        <br />
+        <a href="{$topic->getOwner()->getURL()}">{$topic->getOwner()->getCanonicalName()}</a>
+    </div>
+
+    <form method="POST" enctype="multipart/form-data" style="margin-top: 20px;">
+        <table cellspacing="7" cellpadding="0" width="80%" border="0" align="center">
+            <tbody>
+                <tr>
+                    <td width="120" valign="top">
+                        <span class="nobold">{_title}</span>
+                    </td>
+                    <td>
+                        <input type="text" name="title" style="width: 100%;" value="{$topic->getTitle()}" />
+                    </td>
+                </tr>
+                <tr>
+                    <td width="120" valign="top">
+                        <span class="nobold">{_topic_settings}</span>
+                    </td>
+                    <td>
+                        {if $topic->getClub()->canBeModifiedBy($thisUser)}
+                            <input type="checkbox" name="pin" n:attr="checked => $topic->isPinned()" /> {_pin_topic}<br />
+                        {/if}
+                        <input type="checkbox" name="close" n:attr="checked => $topic->isClosed()" /> {_close_topic}
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <a class="button" href="/topic{$topic->getPrettyId()}/delete?hash={urlencode($csrfToken)}">{_delete_topic}</a>
+                    </td>
+                    <td>
+                        <input type="hidden" name="hash" value="{$csrfToken}" />
+                        <input type="submit" value="{_save}" class="button" />
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+        <input type="hidden" name="hash" value="{$csrfToken}" />
+    </form>
+{/block}
diff --git a/tpl/Topics/Topic.xml b/tpl/Topics/Topic.xml
new file mode 100644
index 0000000..e83e239
--- /dev/null
+++ b/tpl/Topics/Topic.xml
@@ -0,0 +1,29 @@
+{extends "../@layout.xml"}
+{block title}{_view_topic} "{$topic->getTitle()}"{/block}
+
+{block titleHeader}
+    <a href="{$club->getURL()}">{$club->getCanonicalName()}</a>
+    » 
+    <a href="/board{$club->getId()}">{_discussions}</a>
+    » 
+    {_view_topic}
+
+    <div style="float: right;" n:if="$topic->canBeModifiedBy($thisUser)">
+        <a href="/topic{$club->getId()}_{$topic->getVirtualId()}/edit">{_edit_topic_action}</a>
+    </div>
+{/block}
+
+{block body}
+    <div class="container_gray">
+        <b>{$topic->getTitle()}</b>
+        <br />
+        <a href="{$topic->getOwner()->getURL()}">{$topic->getOwner()->getCanonicalName()}</a>
+        <div class="nobold" style="float: right;">
+            {_created} {$topic->getPublicationTime()}
+        </div>
+    </div>
+    <div style="margin-top: 20px;">
+        <h4>{tr("topic_messages_count", $count)}</h4>
+        {include "../components/comments.xml", comments => $comments, count => $count, page => $page, model => "topics", club => $club, readOnly => $topic->isClosed(), showTitle => false, parent => $topic}
+    </div>
+{/block}
diff --git a/tpl/User/View.xml b/tpl/User/View.xml
index 3cdd812..7043136 100755
--- a/tpl/User/View.xml
+++ b/tpl/User/View.xml
@@ -48,13 +48,6 @@
 {block body}
     {if !$user->isBanned()}
     
-    {if !$user->getPrivacyPermission('page.read', $thisUser ?? NULL)}
-        <div class="alert err">
-            <b>{_forbidden}</b><br/>
-            {_forbidden_comment}
-        </div>
-    {else}
-
     <div n:if="!is_null($alert = $user->getAlert())" class="alert fake">{strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}</div>
 
 
@@ -394,8 +387,6 @@
                     {presenter "openvk!Wall->wallEmbedded", $user->getId()}
             </div>
         </div>
-    {/if}
-    
     {else} {* isBanned() *}
         {include "banned.xml"}
     {/if}
diff --git a/tpl/components/attachment.xml b/tpl/components/attachment.xml
index cbf2c33..365530f 100755
--- a/tpl/components/attachment.xml
+++ b/tpl/components/attachment.xml
@@ -10,7 +10,17 @@
         </a>
     {/if}
 {elseif $attachment instanceof \openvk\Web\Models\Entities\Video}
-    <video class="media" src="{$attachment->getURL()}" controls="controls"></video>
+    {if $attachment->getType() === 0}
+        <video class="media" src="{$attachment->getURL()}" controls="controls"></video>
+    {else}
+        {* Не будем загружать страницу плеером ютуба *}
+        <a href="{$attachment->getVideoDriver()->getURL()}" target="_blank">
+            <div class="youtube_video_block">
+                <img class="youtube_button" src="/themepack/mobile_ovk/0.0.1.0/resource/youtube_video.png">
+                <img src="{$attachment->getVideoDriver()->getThumbnailURL()}" style="width: 100%;">
+            </div>
+        </a>
+    {/if}
 {elseif $attachment instanceof \openvk\Web\Models\Entities\Post}
     {php $GLOBALS["_nesAttGloCou"] = (isset($GLOBALS["_nesAttGloCou"]) ? $GLOBALS["_nesAttGloCou"] : 0) + 1}
     {if $GLOBALS["_nesAttGloCou"] > 2}
@@ -18,6 +28,13 @@
     {else}
         {include "post.xml", post => $attachment, compact => true}
     {/if}
+{elseif $attachment instanceof \openvk\Web\Models\Entities\Note}
+    <a href="/note{$attachment->getPrettyId()}">
+        <div class="note_attachment">
+            <img class="note_icon" src="/themepack/mobile_ovk/0.0.1.0/resource/note.png">
+            <span class="note_name">{_note} "{$attachment->getName()}"</span>
+        </div>
+    </a>
 {elseif $attachment instanceof \openvk\Web\Models\Entities\Poll}
     {presenter "openvk!Poll->view", $attachment->getId()}
 {else}
diff --git a/tpl/components/comment.xml b/tpl/components/comment.xml
index 7f4ba55..9974d07 100755
--- a/tpl/components/comment.xml
+++ b/tpl/components/comment.xml
@@ -52,7 +52,7 @@
         </div>
         <div class="comment_content">
                     <a href="{$author->getURL()}"><b>{$author->getCanonicalName()}</b></a><br>
-                    <time class="text-gray">{$post->getPublicationTime()}</time>
+                    <time class="text-gray">{$comment->getPublicationTime()}</time>
                     <div class="comment_body" id="{$comment->getId()}">
                         {$comment->getText()|noescape}
                         
diff --git a/tpl/components/post.xml b/tpl/components/post.xml
index c2bb3f6..6e20bd6 100755
--- a/tpl/components/post.xml
+++ b/tpl/components/post.xml
@@ -1,73 +1,70 @@
 {var author = $post->getOwner()}
-                        <div n:class="post, $post->isExplicit() ? nsfw">
-                            <div class="author">
-                                <img class="ava" src="{$author->getAvatarURL()}">
-                                <div>
-                                    <a href="{$author->getURL()}"><b>{$author->getCanonicalName()}</b></a><img n:if="$author->isVerified()" class="name-checkmark" src="/themepack/mobile_ovk/0.0.1.0/resource/verify_badge.png"><br>
-                                    <time class="text-gray">{$post->getPublicationTime()}</time>
-                                </div>
-                            </div>
-                            
-                            <div class="body">
-                                <p>{$post->getText()|noescape}</p>
-                            </div>
+<div n:class="post, $post->isExplicit() ? nsfw">
+    <div class="author">
+        <img class="ava" src="{$author->getAvatarURL()}">
+        <div>
+            <a href="{$author->getURL()}"><b>{$author->getCanonicalName()}</b></a><img n:if="$author->isVerified()" class="name-checkmark" src="/themepack/mobile_ovk/0.0.1.0/resource/verify_badge.png"><br>
+            <time class="text-gray">{$post->getPublicationTime()}</time>
+        </div>
+    </div>
+
+    <div class="body">
+        <p>{$post->getText()|noescape}</p>
+    </div>
                             
-                            <div class="attachments">
-                                <div n:ifcontent class="attachments_b">
-                                    <div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
-                                        {include "attachment.xml", attachment => $attachment}
-                                    </div>
-                                </div>
-                            </div>
+    <div class="attachments">
+        <div n:ifcontent class="attachments_b">
+            <div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
+                {include "attachment.xml", attachment => $attachment}
+            </div>
+        </div>
+    </div>
                             
-                            <div class="actions">
-                                <!-- <a class="button bold commentbtn" href="">54</a> -->
-<!--                                 <a class="button bold like" href="">1321</a> -->
-
-                        <div class="actions_left">
+    <div class="actions">
+        <!-- <a class="button bold commentbtn" href="">54</a> -->
+        <!--  <a class="button bold like" href="">1321</a> -->
 
-                        {if !($forceNoCommentsLink ?? false)}
-                            <a href="/wall{$post->getPrettyId()}#comments" class="button bold commentbtn">
-                            {if $post->getCommentsCount() > 0}
-                                {$post->getCommentsCount()}
-                            {else}
-                                0
-                            {/if}
-                        </a>
-                        {/if}
-
-                        {if !($forceNoShareLink ?? false)}
-                        <a class="button bold sharebtn" href="javascript:repostPost('{$post->getPrettyId()}', '{rawurlencode($csrfToken)}')">
-                            {if $post->getRepostCount() > 0}
-                                {$post->getRepostCount()}
-                            {else}
-                                0
-                            {/if}
-                        </a>
-                        {/if}
+        <div class="actions_left">
 
-                        </div>
+            {if !($forceNoCommentsLink ?? false)}
+                <a href="/wall{$post->getPrettyId()}#comments" class="button bold commentbtn">
+                    {if $post->getCommentsCount() > 0}
+                        {$post->getCommentsCount()}
+                    {else}
+                        0
+                    {/if}
+                </a>
+            {/if}
 
+            {if true}
+                <a class="button bold sharebtn" href="javascript:mobileRepost('{$post->getPrettyId()}')">
+                    {$post->getRepostCount()}
+                </a>
 
-                    {if (isset($thisUser))}
-                        <div class="actions_right">
+                <div id="post{$post->getPrettyId()}_actions">
 
-                                {if !($forceNoLike ?? false)}
-                                        {var liked = $post->hasLikeFrom($thisUser)}
-                                        <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}"
-                                        class="post-like-button"
-                                        data-liked="{(int) $liked}"
-                                        data-likes="{$post->getLikesCount()}">
-                                        <div class="button bold like post-like-button" id="{if $liked}liked{/if}">
-                                            {_mobile_like} <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
-                                        
-                                        </div>
-                                    </a>
-                                {/if}
+                </div> 
+            {/if}
 
-                        </div>
-                        {/if}
+            </div>
 
+            {if (isset($thisUser))}
+                <div class="actions_right">
 
+                    {if !($forceNoLike ?? false)}
+                        {var liked = $post->hasLikeFrom($thisUser)}
+                        <a href="/wall{$post->getPrettyId()}/like?hash={rawurlencode($csrfToken)}"
+                            class="post-like-button"
+                            data-liked="{(int) $liked}"
+                            data-likes="{$post->getLikesCount()}">
+                            <div class="button bold like post-like-button" id="{if $liked}liked{/if}">
+                                {_mobile_like} <span class="likeCnt">{if $post->getLikesCount() > 0}{$post->getLikesCount()}{/if}</span>
+                            
                             </div>
-                        </div>
+                        </a>
+                    {/if}
+
+                </div>
+            {/if}
+    </div>
+</div>
diff --git a/tpl/components/textArea.xml b/tpl/components/textArea.xml
index 37fce0c..a555199 100755
--- a/tpl/components/textArea.xml
+++ b/tpl/components/textArea.xml
@@ -5,14 +5,21 @@
         <textarea id="wall-post-input{$textAreaId}" placeholder="{_write}" name="text" style="width: 100%;resize: none;" class="small-textarea"></textarea>
         <div>
             <!-- padding to fix <br/> bug -->
-            <input type="file" class="postFileSel" id="postFilePic" name="_pic_attachment" accept="image/*" style="display:none;" />
+            <div id="post-buttons{$textAreaId}">
+                <input type="file" class="postFileSel" id="postFilePic" name="_pic_attachment" accept="image/*" style="display:none;" />
+                <input n:if="!OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading']" type="file" class="postFileSel" id="postFileVid" name="_vid_attachment" accept="video/*" style="display:none;" />
+            </div>
+
             <input type="hidden" name="type" value="1" />
             <input type="hidden" name="hash" value="{$csrfToken}" />
             <br/>
             <input type="submit" value="{_'write'}" class="button new_post" />
             <a href="javascript:void(document.querySelector('#post-buttons{$textAreaId} input[name=_pic_attachment]').click());">
-                       <div class="attach_menu_ph"></div>
-                    </a>
+                <div class="attach_menu_ph"></div>
+            </a>
+            <a n:if="!OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading']" href="javascript:void(document.querySelector('#post-buttons{$textAreaId} input[name=_vid_attachment]').click());">
+                <div class="attach_menu_video"></div>
+            </a>
         </div>
 
 
diff --git a/tpl/components/video.xml b/tpl/components/video.xml
new file mode 100644
index 0000000..752191a
--- /dev/null
+++ b/tpl/components/video.xml
@@ -0,0 +1,35 @@
+<table>
+<tbody>
+    <tr>
+        <td valign="top">
+            <div class="video-preview">
+                <a href="/video{$video->getPrettyId()}">
+                    <img src="{$video->getThumbnailURL()}"
+                    style="max-width: 170px; max-height: 127px; margin: auto;" >
+                </a>
+            </div>
+        </td>
+        <td valign="top" style="width: 100%">
+            {ifset infotable}
+                {include infotable, x => $dat}
+            {else}
+        <a href="/video{$video->getPrettyId()}">
+            <b>
+            {$video->getName()}
+            </b>
+        </a>
+        <br/>
+            <p>
+                <span>{$video->getDescription() ?? ""}</span>
+            </p>
+            <span style="color: grey;">{_video_uploaded} {$video->getPublicationTime()}</span><br/>
+            
+            <p>
+                <a href="/video{$video->getPrettyId()}">{_view_video}</a>
+                {if $video->getCommentsCount() > 0}| <a href="/video{$video->getPrettyId()}#comments">{_comments} ({$video->getCommentsCount()})</a>{/if}
+            </p>
+            {/ifset}
+        </td>
+    </tr>
+</tbody>
+</table>
\ No newline at end of file