diff --git a/Web/Presenters/templates/Notification/Feed.xml b/Web/Presenters/templates/Notification/Feed.xml
index adcc29a8..8c54a5d7 100644
--- a/Web/Presenters/templates/Notification/Feed.xml
+++ b/Web/Presenters/templates/Notification/Feed.xml
@@ -1,4 +1,4 @@
-{extends "../@listView.xml"}
+{extends "../@layout.xml"}
{var $sorting = false}
{block title}
@@ -10,29 +10,47 @@
{_feedback}
{/block}
-{block tabs}
+{block content}
+
-{/block}
-
-{* BEGIN ELEMENTS DESCRIPTION *}
-
-{block link|strip|stripHtml}
- javascript:void(0)
-{/block}
-
-{block preview}
-
-{/block}
-
-{block name}
-
-{/block}
-
-{block description}
- {include $x->getTemplatePath(), notification => $x}
-{/block}
+
+{var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
+{if sizeof($data) > 0}
+
+
+
+
+
+
+
+ |
+
+
+
+ {include $dat->getTemplatePath(), notification => $dat}
+
+
+ |
+
+
+
+ {include "../components/paginator.xml", conf => (object) [
+ "page" => $page,
+ "count" => $count,
+ "amount" => sizeof($data),
+ "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE,
+ "atBottom" => true,
+ ]}
+{else}
+ {ifset customErrorMessage}
+ {include customErrorMessage}
+ {else}
+ {include "../components/nothing.xml"}
+ {/ifset}
+{/if}
+{/block}
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/0/_14_18_.xml b/Web/Presenters/templates/components/notifications/0/_14_18_.xml
index 119434e8..50f99ad7 100644
--- a/Web/Presenters/templates/components/notifications/0/_14_18_.xml
+++ b/Web/Presenters/templates/components/notifications/0/_14_18_.xml
@@ -2,5 +2,8 @@
{var $user = $notification->getModel(1)}
{$user->getCanonicalName()}
-{$notification->getDateTime()} {_nt_liked_yours}
+{_nt_liked_yours}
{_nt_post_nominative} {_nt_from} {$post->getPublicationTime()}.
+
+ {$notification->getDateTime()}
+
diff --git a/Web/Presenters/templates/components/notifications/1/_14_18_.xml b/Web/Presenters/templates/components/notifications/1/_14_18_.xml
index a227b4ec..0211481d 100644
--- a/Web/Presenters/templates/components/notifications/1/_14_18_.xml
+++ b/Web/Presenters/templates/components/notifications/1/_14_18_.xml
@@ -2,5 +2,8 @@
{var $user = $notification->getModel(1)}
{$user->getCanonicalName()}
-{$notification->getDateTime()} {_nt_shared_yours}
+{_nt_shared_yours}
{_nt_post_instrumental} {_nt_from} {$post->getPublicationTime()}.
+
+ {$notification->getDateTime()}
+
diff --git a/Web/Presenters/templates/components/notifications/2/@default.xml b/Web/Presenters/templates/components/notifications/2/@default.xml
index a18b5689..6371e99e 100644
--- a/Web/Presenters/templates/components/notifications/2/@default.xml
+++ b/Web/Presenters/templates/components/notifications/2/@default.xml
@@ -1,4 +1,7 @@
{var $user = $notification->getModel(1)}
{$user->getCanonicalName()}
-{$notification->getDateTime()} {_nt_commented_yours} {include under}: "{$notification->getData()}".
+{_nt_commented_yours} {include under}: "{$notification->getData()}".
+
+ {$notification->getDateTime()}
+
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/3/_14_18_.xml b/Web/Presenters/templates/components/notifications/3/_14_18_.xml
index 03712fb6..53110fed 100644
--- a/Web/Presenters/templates/components/notifications/3/_14_18_.xml
+++ b/Web/Presenters/templates/components/notifications/3/_14_18_.xml
@@ -2,5 +2,8 @@
{var $user = $notification->getModel(1)}
{$user->getCanonicalName()}
-{$notification->getDateTime()} {_nt_written_on_your_wall}
+{_nt_written_on_your_wall}
{_nt_post_nominative}: "{$notification->getData()}".
+
+ {$notification->getDateTime()}
+
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/5/_5_18_.xml b/Web/Presenters/templates/components/notifications/5/_5_18_.xml
index c489b46d..570ff977 100644
--- a/Web/Presenters/templates/components/notifications/5/_5_18_.xml
+++ b/Web/Presenters/templates/components/notifications/5/_5_18_.xml
@@ -3,4 +3,7 @@
{$user->getCanonicalName()}
{_nt_made_you_admin}
-{$club->getCanonicalName()} {$notification->getDateTime()}.
+{$club->getCanonicalName()}.
+
+ {$notification->getDateTime()}
+
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/9601/_20_18_.xml b/Web/Presenters/templates/components/notifications/9601/_20_18_.xml
index 26ec1825..08a80a54 100644
--- a/Web/Presenters/templates/components/notifications/9601/_20_18_.xml
+++ b/Web/Presenters/templates/components/notifications/9601/_20_18_.xml
@@ -1,4 +1,7 @@
{var $gift = $notification->getModel(0)}
{var $sender = $notification->getModel(1)}
-{$sender->getCanonicalName()} отправил вам {$notification->getDateTime()} подарок.
+{$sender->getCanonicalName()} отправил вам подарок.
+
+ {$notification->getDateTime()}
+
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/9602/_18_18_.xml b/Web/Presenters/templates/components/notifications/9602/_18_18_.xml
index e54d2a0a..1addeeb1 100644
--- a/Web/Presenters/templates/components/notifications/9602/_18_18_.xml
+++ b/Web/Presenters/templates/components/notifications/9602/_18_18_.xml
@@ -6,3 +6,6 @@
{if !empty($message)}
{_message}: "{$message}".
{/if}
+
+ {$notification->getDateTime()}
+
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/notifications/9603/_18_18_.xml b/Web/Presenters/templates/components/notifications/9603/_18_18_.xml
index d32cb442..4781f6ec 100644
--- a/Web/Presenters/templates/components/notifications/9603/_18_18_.xml
+++ b/Web/Presenters/templates/components/notifications/9603/_18_18_.xml
@@ -6,3 +6,6 @@
{if !empty($message)}
{_message}: "{$message}".
{/if}
+
+ {$notification->getDateTime()}
+
\ No newline at end of file