diff --git a/db/moona_data.db b/db/moona_data.db
index ea51aec..dd37cb7 100644
Binary files a/db/moona_data.db and b/db/moona_data.db differ
diff --git a/static/css/base.css b/static/css/base.css
index dc1335c..280e427 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -2,11 +2,11 @@
     font-family: 'Montserrat Alternates', sans-serif;
 }
 body {
-  font-family: 'Comfortaa', cursive;
+    font-family: 'Comfortaa', cursive;
 }
 .upp_zag {
-margin-left: auto;
-  margin-right: auto;
-text-align: center;
-margin-top: 50px;
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+    margin-top: 50px;
 }
\ No newline at end of file
diff --git a/static/css/diary.css b/static/css/diary.css
index b3bef88..af196d0 100644
--- a/static/css/diary.css
+++ b/static/css/diary.css
@@ -24,9 +24,9 @@ summary {
     margin-bottom: 10px;
 }
 .my_author {
-    width:148px;
-    height:44px;
-    left:255px;
+    width:40%;
+    height:5%;
+    left:10%;
     -webkit-border-radius: 22px;
     -moz-border-radius: 22px;
     border-radius: 22px;
@@ -40,6 +40,9 @@ summary {
 #image {
     width: 70%;
 }
+.card-body {
+    background-color: #7fc3ff;
+}
 #all_my_post, #all_my_post1 {
     margin-left: auto;
     margin-right: auto;
@@ -53,10 +56,9 @@ summary {
     margin-bottom: 20px;
 }
 .my_author, .my_post_zag {
-    text-align: center;
-    margin-left: auto;
+    margin-left: 50%;
     margin-right: auto;
-    margin-top: 25px;
+    margin-top: -20%;
 }
 .pub, .private {
     width: 60%;
@@ -102,6 +104,10 @@ textarea {
     display:inline-block;
     vertical-align: top;
 }
+.but {
+    width: 80%;
+    margin-bottom:5%;
+}
 #all_my_question {
     width: 30%;
     height: -100%;
@@ -109,7 +115,7 @@ textarea {
 .question, .my_post {
     background-color:#7fc3ff;
     border-radius: 22px;
-    width: 90%;
+    width: 100%;
     margin-left: 10px;
 }
 .is_ans {
diff --git a/static/css/main.css b/static/css/main.css
index bf4c0c3..ee214b3 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -1,49 +1,153 @@
+.bad_user {
+    margin-left: auto;
+    margin-right: auto;
+    background-color: #1daff0;
+    color: #ffffff;
+    width: 50%;
+    height: 55%;
+    -webkit-border-radius:22px;
+    -moz-border-radius: 22px;
+    border-radius: 22px;
+    border:2px solid #ffffff;
+    margin-top: 20px;
+}
+#main_table {
+    margin-left:7%
+}
+.bad_centre {
+    text-align: center;
+}
+summary {
+    margin-bottom: 10px;
+}
+.pos_emot {
+    margin-bottom: 10px;
+}
+.nig_emot {
+    margin-bottom: 10px;
+}
+.my_author {
+    width:40%;
+    height:5%;
+    left:10%;
+    -webkit-border-radius: 22px;
+    -moz-border-radius: 22px;
+    border-radius: 22px;
+    border:2px solid #ffffff;
+    background-color:#1daff0;
+    top: 98px;
+}
+.emot {
+    margin-bottom: 30px;
+}
+#image {
+    width: 70%;
+}
+.card-body {
+    background-color: #7fc3ff;
+}
+#all_my_post, #all_my_post1 {
+    margin-left: auto;
+    margin-right: auto;
+}
+#my_post, #my_post1 {
+    text-align: center;
+    margin-left: auto;
+    margin-right: auto;
+    background-color: #7fc3ff;
+    border-radius: 50px;
+    margin-bottom: 20px;
+}
+.my_author, .my_post_zag {
+    margin-left: 50%;
+    margin-right: auto;
+    margin-top: -20%;
+}
+.pub, .private {
+    width: 60%;
+    height: 10%;
+    margin-left: auto;
+    margin-right: auto;
+}
 #add_post {
     margin-top: 20px;
     margin-left: 83%;
 }
-.row1, .row2, .row3 {
-    width: 33%;
+#edit_btn, #edit_btn1 {
+    background-color: #c5f1ff;
+}
+input[type=text], input[type=email], input[type=password], input[type=file], input[type=number]{
+  padding:10px;
+  border:5;
+  box-shadow:0 0 15px 4px rgba(0,0,0,0.06);
+  border-radius:10px;
+}
+textarea {
+  width:100%;
+  resize: vertical;
+  padding:10px;
+  border-radius:10px;
+  border:5;
+  box-shadow:0 0 15px 4px rgba(0,0,0,0.06);
+  height:150px;
+}
+.post_form {
+  margin-left: auto;
+  margin-right: auto;
+  width: 80%;
+  height: 50%
+}
+.box {
+    margin-left: 20px;
+}
+.row2, .row1, .row3{
+    width: 30%;
+}
+.row1, .row2, .question, .row3{
     display:inline-block;
     vertical-align: top;
-    margin-top: 39px;
 }
-.rowdiv1, .rowdiv2, .rowdiv3 {
-    width: 95%;
+.but {
+    width: 80%;
+    margin-bottom:5%;
 }
-.post_zag, .card-text, .card-body, .post_zag, .author {
-    width: 90%;
-    margin-left: auto;
-    margin-right: auto;
-    text-align: center;
+#all_my_question {
+    width: 30%;
+    height: -100%;
 }
-.post {
-    background-color: #7fc3ff;
-    border-radius: 50px;
-    width: 90%;
-    height: 95%;
-    margin-bottom: 20px;
-}
-details {
-    color: #ffffff;
-}
-#main_table {
-    margin-left: 10%;
-    margin-right: auto;
-    width: 90%;
-}
-.question {
+.question, .my_post {
     background-color:#7fc3ff;
     border-radius: 22px;
-    width: 90%;
-    margin-left: 10px;
+    width: 100%;
 }
 .is_ans {
     background-color:#ddefff;
     border:2px solid #ffffff;
     border-radius: 25px;
-    width: 95%;
+    width: 380px;
 }
-.but {
-    width: 80%;
+.emot_block {
+    color: #ffffff;
+    font-weight: bolder;
+}
+table {
+    margin-left: 10%;
+    width: 90%;
+}
+.like {
+    width: 50%;
+    margin-left: auto;
+    margin-right: auto;
+}
+.row1_div, .row2_div, .row3div {
+    width: 100%;
+}
+td {
+    margin: 20px;
+}
+#all_my_question {
+width: 25%;
+}
+.is_ans {
+width: 95%;
 }
\ No newline at end of file
diff --git a/static/css/publications.css b/static/css/publications.css
index da17a29..aa022a9 100644
--- a/static/css/publications.css
+++ b/static/css/publications.css
@@ -1,41 +1,141 @@
-.but {
-    width: 80%;
-}
-table {
-    margin-left: 10%;
-    margin-right: auto;
-    width: 90%;
-}
-#row1, #row2, #row3 {
-    width: 33%;
-    display:inline-block;
-    vertical-align: top;
-    margin-top: 39px;
-}
-#row1_div, #row2_div, #row3_div {
-    width: 95%;
-}
-.post_zag, .card-text, .card-body, .post_zag, .author {
-    width: 90%;
+.bad_user {
     margin-left: auto;
     margin-right: auto;
-    text-align: center;
+    background-color: #1daff0;
+    color: #ffffff;
+    width: 50%;
+    height: 55%;
+    -webkit-border-radius:22px;
+    -moz-border-radius: 22px;
+    border-radius: 22px;
+    border:2px solid #ffffff;
+    margin-top: 20px;
 }
-.post {
+.bad_centre {
+    text-align: center;
+    margin-left:20%;
+    margin-right: -20%
+}
+summary {
+    margin-bottom: 10px;
+}
+.pos_emot {
+    margin-bottom: 10px;
+}
+.nig_emot {
+    margin-bottom: 10px;
+}
+.my_author {
+    width:40%;
+    height:5%;
+    left:10%;
+    -webkit-border-radius: 22px;
+    -moz-border-radius: 22px;
+    border-radius: 22px;
+    border:2px solid #ffffff;
+    background-color:#1daff0;
+    top: 98px;
+}
+.emot {
+    margin-bottom: 30px;
+}
+#image {
+    width: 70%;
+}
+.card-body {
+    background-color: #7fc3ff;
+}
+#all_my_post, #all_my_post1 {
+    margin-left: auto;
+    margin-right: auto;
+}
+#my_post, #my_post1 {
+    text-align: center;
+    margin-left: auto;
+    margin-right: auto;
     background-color: #7fc3ff;
     border-radius: 50px;
-    width: 90%;
-    height: 95%;
     margin-bottom: 20px;
 }
-details {
-    color: #ffffff;
+.my_author, .post_zag {
+    margin-left: 50%;
+    margin-right: auto;
+    margin-top: -20%;
+}
+.pub, .private {
+    width: 60%;
+    height: 10%;
+    margin-left: auto;
+    margin-right: auto;
 }
 #add_post {
     margin-top: 20px;
     margin-left: 83%;
 }
-.hz1 {
-    margin: 5%;
-    font-size: 160%;
+#edit_btn, #edit_btn1 {
+    background-color: #c5f1ff;
+}
+input[type=text], input[type=email], input[type=password], input[type=file], input[type=number]{
+  padding:10px;
+  border:5;
+  box-shadow:0 0 15px 4px rgba(0,0,0,0.06);
+  border-radius:10px;
+}
+textarea {
+  width:100%;
+  resize: vertical;
+  padding:10px;
+  border-radius:10px;
+  border:5;
+  box-shadow:0 0 15px 4px rgba(0,0,0,0.06);
+  height:150px;
+}
+.post_form {
+  margin-left: auto;
+  margin-right: auto;
+  width: 80%;
+  height: 50%
+}
+.box {
+    margin-left: 20px;
+}
+#row2, #row1 {
+    width: 30%;
+}
+#row1, #row2, #all_my_question {
+    display:inline-block;
+    vertical-align: top;
+}
+.but {
+    width: 80%;
+    margin-bottom:5%;
+}
+#all_my_question {
+    width: 30%;
+    height: -100%;
+}
+.question, .my_post {
+    background-color:#7fc3ff;
+    border-radius: 22px;
+    width: 100%;
+    margin-left: 10px;
+}
+.emot_block {
+    color: #ffffff;
+    font-weight: bolder;
+}
+table {
+    margin-left: 10%;
+    width: 90%;
+}
+.like {
+    width: 50%;
+    margin-left: auto;
+    margin-right: auto;
+}
+#row1_div, #row2_div {
+width: 98%;
+}
+td {
+    margin: 20px;
 }
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index b26a98c..b8307c6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -21,11 +21,8 @@
         }
       }
 
-
-
     </style>
     <link href="sidebars.css" rel="stylesheet">
-    <link href="../static/css/base.css">
     <link rel="stylesheet"
           href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
           integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
@@ -73,7 +70,7 @@
     </a>
     <ul class="nav nav-pills nav-flush flex-column mb-auto text-center">
         <li class="nav-item">
-            <a href="/" class="nav-link active py-3 border-bottom" aria-current="page" title="Главная"
+            <a href="/" class="nav-link active py-3 border-bottom" title="Главная"
                data-bs-toggle="tooltip" data-bs-placement="right">
                 <svg class="bi" width="24" height="24" role="img" aria-label="Главная">
                     <use xlink:href="#home"/>
diff --git a/templates/diary.html b/templates/diary.html
index 6ea3f01..0ffbd7b 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -3,85 +3,92 @@
 
 {% block content %}
 {% if current_user.is_authenticated %}
-<h1 class="upp_zag">Главная</h1>
-<div>
-    <a href="/add_post" id="add_post" class="btn btn-primary"
-       style="background-color:#1daff0;border-radius: 15px;"><strong>Добавить
-        запись</strong></a>
-</div>
+<table class="but">
+    <tr>
+        <td style="width: 110%;">
+            <h1 class="upp_zag">Дневник</h1>
+        </td>
+        <td>
+            <a href="/add_post" id="add_post" class="btn btn-primary"
+               style="background-color:#1daff0;border-radius: 15px;"><strong>Добавить
+                запись</strong></a>
+        </td>
+    </tr>
+</table>
 <table>
     <td id="row1">
         <div id="row1_div">
-            <h1 class="my_post_zag">Публикации</h1>
+            <h2 class="my_post_zag" style="margin-bottom: 10%; margin-left:15%">Публикации</h2>
             <div id="all_my_post1">
                 {% if my_post != [] %}
                 {% for item in pub_post %}
-                <div class="card-body" id="my_post1">
-                    <details>
-                        <summary style="color:#ffffff">{% if item.name != None %}
-                            <h2 class="card-title" id="my_post_zag1" style="color:#c5f1ff">{{item.name}}</h2>
-                            {% endif %}
-                        </summary>
-                        {% if item.text != None %}
-                        <strong class="card-text" id="my_text1" style="color:#ffffff">{{item.text}}</strong>
-                        {% endif %}
-                    </details>
-                    {% if emotion_pub[loop.index0]['pos_emot'] != None %}
-                    <div class="pos_emot">
-                        <details>
-                            <summary class="emot_block">
-                                <strong class="emot_block">Позитивные эмоции</strong>
-                            </summary>
-                            {% for item2 in emotion_pub[loop.index0]['pos_emot'] %}
-                            <strong class="alert alert-success" role="alert"
-                                    style="border-radius: 22px;">{{item2}}</strong>
-                            {% endfor %}
-                        </details>
-                    </div>
-                    {% endif %}
-                    {% if emotion_pub[loop.index0]['nig_emot'] != None %}
-                    <div class="nig_emot">
-                        <details>
-                            <summary class="emot_block">
-                                <strong class="emot_block">Негативные эмоции</strong>
-                            </summary>
-                            <p></p>
-                            {% for item2 in emotion_pub[loop.index0]['nig_emot'] %}
-                            <strong class="alert alert-danger" role="alert"
-                                    style="border-radius: 22px;">{{item2}}</strong>
-                            {% endfor %}
-                        </details>
-                    </div>
-                    {% endif %}
+
+                <div class="card" style="width: 25rem;">
                     {% if item.photo != None %}
-                    <div class="photo">
-                        <img width="90%" src="{{ item.photo }}"
-                             style="border-radius: 22px;">
-                    </div>
+                    <img src="{{ item.photo }}" class="card-img-top" alt="...">
                     {% endif %}
-                    {% if emotion_pub[loop.index0]['link'] != None %}
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Ссылки</strong>
-                        </summary>
-                        {% for item2 in emotion_pub[loop.index0]['link'] %}
-                        <div class="link">
-                            <a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
-                                {{ loop.index }}</a>
-                        </div>
-                        {% endfor %}
-                    </details>
+                  <div class="card-body">
+                      {% if item.name != None %}
+                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                      {% endif %}
+                      <p><small>{{item.date}}</small></p>
+                      {% if item.text != None %}
+                      <p class="card-text">{{item.text}}</p>
+                      {% endif %}
+                  </div>
+                  <ul class="list-group list-group-flush">
+                  <li class="list-group-item">
+                    {% if emotion_pub[loop.index0]['pos_emot'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
+                            {% for item2 in emotion[loop.index0]['pos_emot'] %}
+                            <li>
+                                <div class="emot"><strong class="alert alert-success" role="alert"
+                                                          style="border-radius: 22px;">{{item2}}</strong></div>
+                            </li>
+                            {% endfor %}
+                        </ul>
                     {% endif %}
+                  </li>
+                    <li class="list-group-item">
+                        {% if emotion_pub[loop.index0]['nig_emot'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                                {% for item2 in emotion_pub[loop.index0]['nig_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-danger" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    <li class="list-group-item">
+                        {% if emotion_pub[loop.index0]['link'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                                {% for item2 in emotion_pub[loop.index0]['link'] %}
+                                <li>
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                        {{ loop.index }}</a></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                  </ul>
+                  <div class="card-body">
                     {% if item.public == 1 or item.public == 'True' %}
-                    <div style="border-radius: 22px;" class="alert alert-success pub" role="alert">Запись
+                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
                         опубликована
                     </div>
                     {% else %}
-                    <div style="border-radius: 22px;" class="alert alert-danger private" role="alert">Запись
+                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
                         приватная
                     </div>
                     {% endif %}
-                    <div class="like">
+                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
+                                                style="border-radius: 22px">
+                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
+                    </div>
+                    <div class="like" style="margin-top:5%; margin-left:1%">
                         <a type="button"
                            href="/new_like/{{current_user.id}}/{{item.id}}/diary">
                             {% if emotion_pub[loop.index0]['is_like'] %}
@@ -91,19 +98,14 @@
                             {% endif %}
                         </a>
                         {% if emotion_pub[loop.index0]['like'] != None %}
-                        <p style="color:#ffffff">{{emotion_pub[loop.index0]['like']}}</p>
+                        <p style="color:#ffffff; margin-left:30%">{{emotion_pub[loop.index0]['like']}}</p>
                         {% endif %}
                     </div>
-                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
-                                                style="border-radius: 22px">
-                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
-                    </div>
-                    <strong style="color:#ffffff">{{item.date}}</strong>
                     <div>
-                        <a style="border-radius: 15px;" href="/post/{{ item.id }}" class="btn" , id="edit_btn">
+                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
                             Изменить
                         </a>
-                        <a style="border-radius: 15px;" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
+                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
                             Удалить
                         </a>
                     </div>
@@ -119,27 +121,27 @@
     </td>
     <td id="row2">
         <div id="row2_div">
-            <h1 class="my_post_zag">Мои мысли</h1>
+            <h2 class="my_post_zag" style="margin-bottom: 10%; margin-left:15%">Мои мысли</h2>
             <div id="all_my_post">
                 {% if my_post != [] %}
                 {% for item in my_post %}
-                <div class="card-body" id="my_post">
-                    <details>
-                        <summary style="color:#ffffff">{% if item.name != None %}
-                            <h2 class="card-title" id="my_post_zag" style="color:#c5f1ff">{{item.name}}</h2>
-                            {% endif %}
-                        </summary>
-                        {% if item.text != None %}
-                        <strong class="card-text" id="my_text" style="color:#ffffff">{{item.text}}</strong>
-                        {% endif %}
-                    </details>
-                    {% if emotion[loop.index0]['pos_emot'] != None %}
-                    <div class="pos_emot">
-                        <details>
-                            <summary class="emot_block">
-                                <strong class="emot_block">Позитивные эмоции</strong>
-                            </summary>
-                            <ul style="list-style-type: none">
+                <div class="card" style="width: 25rem;">
+                    {% if item.photo != None %}
+                    <img src="{{ item.photo }}" class="card-img-top" alt="...">
+                    {% endif %}
+                  <div class="card-body">
+                      {% if item.name != None %}
+                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                      {% endif %}
+                      <p><small>{{item.date}}</small></p>
+                      {% if item.text != None %}
+                      <p class="card-text">{{item.text}}</p>
+                      {% endif %}
+                  </div>
+                  <ul class="list-group list-group-flush">
+                    <li class="list-group-item">
+                        {% if emotion_pub[loop.index0]['pos_emot'] != None %}
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
                                 {% for item2 in emotion[loop.index0]['pos_emot'] %}
                                 <li>
                                     <div class="emot"><strong class="alert alert-success" role="alert"
@@ -147,51 +149,40 @@
                                 </li>
                                 {% endfor %}
                             </ul>
-                        </details>
-                    </div>
-                    {% endif %}
-                    {% if emotion[loop.index0]['nig_emot'] != None %}
-                    <div class="nig_emot">
-                        <details>
-                            <summary class="emot_block">
-                                <strong class="emot_block">Негативные эмоции</strong>
-                            </summary>
-                            <ul style="list-style-type: none">
-                                {% for item2 in emotion[loop.index0]['nig_emot'] %}
+                        {% endif %}
+                    </li>
+                    <li class="list-group-item">
+                        {% if emotion_pub[loop.index0]['nig_emot'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                                {% for item2 in emotion_pub[loop.index0]['nig_emot'] %}
                                 <li>
                                     <div class="emot"><strong class="alert alert-danger" role="alert"
                                                               style="border-radius: 22px;">{{item2}}</strong></div>
                                 </li>
                                 {% endfor %}
-                            </ul>
-                        </details>
-                    </div>
-                    {% endif %}
-                    {% if item.photo != None %}
-                    <div class="photo">
-                        <img width="90%" src="{{ item.photo }}"
-                             style="border-radius: 22px;">
-                    </div>
-                    {% endif %}
-                    {% if emotion[loop.index0]['link'] != None %}
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Ссылки</strong>
-                        </summary>
-                        {% for item2 in emotion[loop.index0]['link'] %}
-                        <div class="link">
-                            <a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
-                                {{ loop.index }}</a>
-                        </div>
-                        {% endfor %}
-                    </details>
-                    {% endif %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    <li class="list-group-item">
+                        {% if emotion_pub[loop.index0]['link'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                                {% for item2 in emotion_pub[loop.index0]['link'] %}
+                                <li>
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                        {{ loop.index }}</a></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                  </ul>
+                  <div class="card-body">
                     {% if item.public == 1 or item.public == 'True' %}
-                    <div style="border-radius: 22px;" class="alert alert-success pub" role="alert">Запись
+                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
                         опубликована
                     </div>
                     {% else %}
-                    <div style="border-radius: 22px;" class="alert alert-danger private" role="alert">Запись
+                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
                         приватная
                     </div>
                     {% endif %}
@@ -199,12 +190,11 @@
                                                 style="border-radius: 22px">
                         <strong style="color: #ffffff">{{ current_user.name }}</strong>
                     </div>
-                    <strong style="color:#ffffff">{{item.date}}</strong>
                     <div>
-                        <a style="border-radius: 15px;" href="/post/{{ item.id }}" class="btn" id="edit_btn1">
+                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
                             Изменить
                         </a>
-                        <a style="border-radius: 15px;" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
+                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
                             Удалить
                         </a>
                     </div>
@@ -220,7 +210,7 @@
     </td>
     <td id="all_my_question">
         <div id="row3_div">
-            <h1 class="my_post_zag">Вопросы дня</h1>
+            <h2 class="my_post_zag" style="margin-top:10%; margin-left:15%">Вопросы дня</h2>
             <div class="my_post">
                 <div class="question">
                     {% for item in question %}
diff --git a/templates/main.html b/templates/main.html
index b95752e..aaa9bd8 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -15,9 +15,9 @@
     </tr>
 </table>
 <table id="main_table">
-    <th class="row1">
+    <td class="row1">
         <div class="rowdiv1">
-            <h1 class="my_post_zag">Вопросы дня</h1>
+            <h2 class="my_post_zag" style="margin-left:15%">Вопросы дня</h2>
             <div class="my_post">
                 <div class="question">
                     {% for item in question %}
@@ -39,206 +39,208 @@
                 </div>
             </div>
         </div>
-    </th>
-    <th class="row2">
+    </td>
+    <td class="row2">
         <div class="rowdiv2">
-            <h2 class="post_zag">Вам будет интересно</h2>
+            <h2 class="post_zag" style="margin-top:-20%">Вам будет интересно</h2>
             {% if for_me_post != [] %}
             {% for item in for_me_post %}
-            <div class="card-body post">
-                <details>
-                    <summary>
-                        {% if item.name != None %}
-                        <h3 class="card-title post_zag" style="color:#c5f1ff">{{item.name}}</h3>
-                        {% endif %}
-                    </summary>
-                    {% if item.text != None %}
-                    <strong class="card-text" style="color:#ffffff">{{item.text}}</strong>
+            <div class="card" style="width: 25rem;">
+                    {% if item.photo != None %}
+                    <img src="{{ item.photo }}" class="card-img-top" alt="...">
                     {% endif %}
-                </details>
-                {% if emotion_for_you[loop.index0]['pos_emot'] != None %}
-                <div class="pos_emot">
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Позитивные эмоции</strong>
-                        </summary>
-                        <p></p>
-                        {% for item2 in emotion_for_you[loop.index0]['pos_emot'] %}
-                        <strong class="alert alert-success" role="alert"
-                                style="border-radius: 22px;">{{item2}}</strong>
-                        {% endfor %}
-                    </details>
-                </div>
-                <p></p>
-                {% endif %}
-                {% if emotion_for_you[loop.index0]['nig_emot'] != None %}
-                <div class="nig_emot">
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Негативные эмоции</strong>
-                        </summary>
-                        <p></p>
-                        {% for item2 in emotion_for_you[loop.index0]['nig_emot'] %}
-                        <strong class="alert alert-danger" role="alert"
-                                style="border-radius: 22px;">{{item2}}</strong>
-                        {% endfor %}
-                    </details>
-                </div>
-                <p></p>
-                {% endif %}
-                {% if item.photo != None %}
-                <p></p>
-                <div class="photo">
-                    <img width="90%" src="{{ item.photo }}"
-                         style="border-radius: 22px;">
-                </div>
-                <p></p>
-                {% endif %}
-                {% if current_user.is_authenticated %}
-                <div class="like">
-                    <a type="button"
-                       href="/new_like/{{current_user.id}}/{{item.id}}/main">
-                        {% if emotion_for_you[loop.index0]['is_like'] %}
-                        <img src="../static/img/like_add.png" width="117" height="100">
-                        {% else %}
-                        <img src="../static/img/like.png" width="94" height="80">
+                  <div class="card-body">
+                      {% if item.name != None %}
+                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                      {% endif %}
+                      <p><small>{{item.date}}</small></p>
+                      {% if item.text != None %}
+                      <p class="card-text">{{item.text}}</p>
+                      {% endif %}
+                  </div>
+                    <ul class="list-group list-group-flush">
+                      <li class="list-group-item">
+                        {% if emotion_for_you[loop.index0]['pos_emot'] != None %}
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
+                                {% for item2 in emotion_for_you[loop.index0]['pos_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-success" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                            </ul>
                         {% endif %}
-                    </a>
-                    {% if emotion_for_you[loop.index0]['like'] != None %}
-                    <p style="color:#ffffff">{{emotion_for_you[loop.index0]['like']}}</p>
-                    {% endif %}
-                </div>
-                {% endif %}
-                {% if emotion_for_you[loop.index0]['link'] != None %}
-                <details>
-                    <summary class="emot_block">
-                        <strong class="emot_block">Ссылки</strong>
-                    </summary>
-                    <p></p>
-                    {% for item2 in emotion_for_you[loop.index0]['link'] %}
-                    <div class="link">
-                        <a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
-                            {{ loop.index }}</a>
+                      </li>
+                    <li class="list-group-item">
+                        {% if emotion_for_you[loop.index0]['nig_emot'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                                {% for item2 in emotion_for_you[loop.index0]['nig_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-danger" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    <li class="list-group-item">
+                        {% if emotion_for_you[loop.index0]['link'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                                {% for item2 in emotion_for_you[loop.index0]['link'] %}
+                                <li>
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                        {{ loop.index }}</a></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    </ul>
+                    <div class="card-body">
+                    {% if item.public == 1 or item.public == 'True' %}
+                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
+                        опубликована
+                    </div>
+                    {% else %}
+                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
+                        приватная
+                    </div>
+                    {% endif %}
+                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
+                                                style="border-radius: 22px">
+                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
+                    </div>
+                    <div class="like" style="margin-top:5%; margin-left:1%">
+                        <a type="button"
+                           href="/new_like/{{current_user.id}}/{{item.id}}/diary">
+                            {% if emotion_for_you[loop.index0]['is_like'] %}
+                            <img src="../static/img/like_add.png" width="117" height="100">
+                            {% else %}
+                            <img src="../static/img/like.png" width="94" height="80">
+                            {% endif %}
+                        </a>
+                        {% if emotion_for_you[loop.index0]['like'] != None %}
+                        <p style="color:#ffffff; margin-left:30%">{{emotion_for_you[loop.index0]['like']}}</p>
+                        {% endif %}
+                    </div>
+                    <div>
+                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
+                            Изменить
+                        </a>
+                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
+                            Удалить
+                        </a>
                     </div>
-                    <p></p>
-                    {% endfor %}
-                </details>
-                {% endif %}
-                <div class="author" style="style=position:absolute; width:148px; height:44px; left:255px; -webkit-border-radius:
-             22px;-moz-border-radius: 22px;border-radius: 22px; border:2px solid #FFFFFF; background-color:#1daff0; top:
-             98px;"><img src="../{{ emotion_for_you[loop.index0]['author'].photo }}" width="40" height="40"
-                         style="border-radius: 22px">
-                    <strong style="color: #ffffff">{{ emotion_for_you[loop.index0]['author'].name }}</strong>
                 </div>
-                <strong style="color:#ffffff">{{item.date}}</strong>
+                {% endfor %}
             </div>
-            {% endfor %}
             {% else %}
             <div class="bad_centre" style="background-color:#1daff0; border-radius: 22px;color:#ffffff">
                 <p class="hz1">Ничего не нашлось :с</p>
             </div>
             {% endif %}
         </div>
-    </th>
-    <th class="row3">
+    </td>
+    <td class="row3">
         <div class="rowdiv3">
-            <h2 class="post_zag">Вам понравились эти посты</h2>
+            <h2 class="post_zag" style="margin-top:-20%; margin-left:5%">Вам понравилось</h2>
             {% if you_like_that != [] %}
             {% for item in you_like_that %}
-            <div class="card-body post">
-                <details>
-                    <summary>
-                        {% if item.name != None %}
-                        <h3 class="card-title post_zag" style="color:#c5f1ff">{{item.name}}</h3>
-                        {% endif %}
-                    </summary>
-                    {% if item.text != None %}
-                    <strong class="card-text" style="color:#ffffff">{{item.text}}</strong>
+            <div class="card" style="width: 25rem;">
+                    {% if item.photo != None %}
+                    <img src="{{ item.photo }}" class="card-img-top" alt="...">
                     {% endif %}
-                </details>
-                {% if emotion_you_like_that[loop.index0]['pos_emot'] != None %}
-                <div class="pos_emot">
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Позитивные эмоции</strong>
-                        </summary>
-                        <p></p>
-                        {% for item2 in emotion_you_like_that[loop.index0]['pos_emot'] %}
-                        <strong class="alert alert-success" role="alert"
-                                style="border-radius: 22px;">{{item2}}</strong>
-                        {% endfor %}
-                    </details>
-                </div>
-                <p></p>
-                {% endif %}
-                {% if emotion_you_like_that[loop.index0]['nig_emot'] != None %}
-                <div class="nig_emot">
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Негативные эмоции</strong>
-                        </summary>
-                        <p></p>
-                        {% for item2 in emotion_you_like_that[loop.index0]['nig_emot'] %}
-                        <strong class="alert alert-danger" role="alert"
-                                style="border-radius: 22px;">{{item2}}</strong>
-                        {% endfor %}
-                    </details>
-                </div>
-                <p></p>
-                {% endif %}
-                {% if item.photo != None %}
-                <p></p>
-                <div class="photo">
-                    <img width="90%" src="{{ item.photo }}"
-                         style="border-radius: 22px;">
-                </div>
-                <p></p>
-                {% endif %}
-                {% if current_user.is_authenticated %}
-                <div class="like">
-                    <a type="button"
-                       href="/new_like/{{current_user.id}}/{{item.id}}/main">
-                        {% if emotion_you_like_that[loop.index0]['is_like'] %}
-                        <img src="../static/img/like_add.png" width="117" height="100">
-                        {% else %}
-                        <img src="../static/img/like.png" width="94" height="80">
+                  <div class="card-body">
+                      {% if item.name != None %}
+                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                      {% endif %}
+                      <p><small>{{item.date}}</small></p>
+                      {% if item.text != None %}
+                      <p class="card-text">{{item.text}}</p>
+                      {% endif %}
+                  </div>
+                    <ul class="list-group list-group-flush">
+                      <li class="list-group-item">
+                        {% if emotion_you_like_that[loop.index0]['pos_emot'] != None %}
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
+                                {% for item2 in emotion_you_like_that[loop.index0]['pos_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-success" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                            </ul>
                         {% endif %}
-                    </a>
-                    {% if emotion_you_like_that[loop.index0]['like'] != None %}
-                    <p style="color:#ffffff">{{emotion_you_like_that[loop.index0]['like']}}</p>
-                    {% endif %}
-                </div>
-                {% endif %}
-                {% if emotion_you_like_that[loop.index0]['link'] != None %}
-                <details>
-                    <summary class="emot_block">
-                        <strong class="emot_block">Ссылки</strong>
-                    </summary>
-                    <p></p>
-                    {% for item2 in emotion_you_like_that[loop.index0]['link'] %}
-                    <div class="link">
-                        <a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
-                            {{ loop.index }}</a>
+                      </li>
+                    <li class="list-group-item">
+                        {% if emotion_you_like_that[loop.index0]['nig_emot'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                                {% for item2 in emotion_you_like_that[loop.index0]['nig_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-danger" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    <li class="list-group-item">
+                        {% if emotion_you_like_that[loop.index0]['link'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                                {% for item2 in emotion_you_like_that[loop.index0]['link'] %}
+                                <li>
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                        {{ loop.index }}</a></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    </ul>
+                    <div class="card-body">
+                    {% if item.public == 1 or item.public == 'True' %}
+                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
+                        опубликована
+                    </div>
+                    {% else %}
+                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
+                        приватная
+                    </div>
+                    {% endif %}
+                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
+                                                style="border-radius: 22px">
+                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
+                    </div>
+                    <div class="like" style="margin-top:5%; margin-left:1%">
+                        <a type="button"
+                           href="/new_like/{{current_user.id}}/{{item.id}}/diary">
+                            {% if emotion_you_like_that[loop.index0]['is_like'] %}
+                            <img src="../static/img/like_add.png" width="117" height="100">
+                            {% else %}
+                            <img src="../static/img/like.png" width="94" height="80">
+                            {% endif %}
+                        </a>
+                        {% if emotion_you_like_that[loop.index0]['like'] != None %}
+                        <p style="color:#ffffff; margin-left:30%">{{emotion_you_like_that[loop.index0]['like']}}</p>
+                        {% endif %}
+                    </div>
+                    <div>
+                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
+                            Изменить
+                        </a>
+                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
+                            Удалить
+                        </a>
                     </div>
-                    <p></p>
-                    {% endfor %}
-                </details>
-                {% endif %}
-                <div class="author" style="style=position:absolute; width:148px; height:44px; left:255px; -webkit-border-radius:
-             22px;-moz-border-radius: 22px;border-radius: 22px; border:2px solid #FFFFFF; background-color:#1daff0; top:
-             98px;"><img src="../{{ emotion_you_like_that[loop.index0]['author'].photo }}" width="40" height="40"
-                         style="border-radius: 22px">
-                    <strong style="color: #ffffff">{{ emotion_you_like_that[loop.index0]['author'].name }}</strong>
                 </div>
-                <strong style="color:#ffffff">{{item.date}}</strong>
+                {% endfor %}
             </div>
-            {% endfor %}
             {% else %}
             <div class="bad_centre" style="background-color:#1daff0; border-radius: 22px;color:#ffffff">
                 <p class="hz1">Ничего не нашлось :с</p>
             </div>
             {% endif %}
         </div>
-    </th>
+    </td>
 </table>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/publications.html b/templates/publications.html
index 7b5f2b5..b55ad6f 100644
--- a/templates/publications.html
+++ b/templates/publications.html
@@ -23,59 +23,74 @@
             <div class="fresh_block" id="pop">
                 {% if pop_post != [] %}
                 {% for item in pop_post %}
-                <div class="card-body post">
-                    <details>
-                        <summary>
-                            {% if item.name != None %}
-                            <h3 class="card-title post_zag" style="color:#c5f1ff">{{item.name}}</h3>
-                            {% endif %}
-                        </summary>
-                        {% if item.text != None %}
-                        <strong class="card-text" style="color:#ffffff">{{item.text}}</strong>
-                        {% endif %}
-                    </details>
-                    {% if emotion_pop[loop.index0]['pos_emot'] != None %}
-                    <div class="pos_emot">
-                        <details>
-                            <summary class="emot_block">
-                                <strong class="emot_block">Позитивные эмоции</strong>
-                            </summary>
-                            <p></p>
-                            {% for item2 in emotion_pop[loop.index0]['pos_emot'] %}
-                            <strong class="alert alert-success" role="alert"
-                                    style="border-radius: 22px;">{{item2}}</strong>
-                            {% endfor %}
-                        </details>
-                    </div>
-                    <p></p>
-                    {% endif %}
-                    {% if emotion_pop[loop.index0]['nig_emot'] != None %}
-                    <div class="nig_emot">
-                        <details>
-                            <summary class="emot_block">
-                                <strong class="emot_block">Негативные эмоции</strong>
-                            </summary>
-                            <p></p>
-                            {% for item2 in emotion_pop[loop.index0]['nig_emot'] %}
-                            <strong class="alert alert-danger" role="alert"
-                                    style="border-radius: 22px;">{{item2}}</strong>
-                            {% endfor %}
-                        </details>
-                    </div>
-                    <p></p>
-                    {% endif %}
+                 <div class="card" style="width: 25rem;">
                     {% if item.photo != None %}
-                    <p></p>
-                    <div class="photo">
-                        <img width="90%" src="{{ item.photo }}"
-                             style="border-radius: 22px;">
-                    </div>
-                    <p></p>
+                    <img src="{{ item.photo }}" class="card-img-top" alt="...">
                     {% endif %}
-                    {% if current_user.is_authenticated %}
-                    <div class="like">
+                  <div class="card-body">
+                      {% if item.name != None %}
+                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                      {% endif %}
+                      <p><small>{{item.date}}</small></p>
+                      {% if item.text != None %}
+                      <p class="card-text">{{item.text}}</p>
+                      {% endif %}
+                  </div>
+                    <ul class="list-group list-group-flush">
+                      <li class="list-group-item">
+                        {% if emotion_pop[loop.index0]['pos_emot'] != None %}
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
+                                {% for item2 in emotion_pop[loop.index0]['pos_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-success" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                            </ul>
+                        {% endif %}
+                      </li>
+                    <li class="list-group-item">
+                        {% if emotion_pop[loop.index0]['nig_emot'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                                {% for item2 in emotion_pop[loop.index0]['nig_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-danger" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    <li class="list-group-item">
+                        {% if emotion_pop[loop.index0]['link'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                                {% for item2 in emotion_pop[loop.index0]['link'] %}
+                                <li>
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                        {{ loop.index }}</a></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    </ul>
+                    <div class="card-body">
+                    {% if item.public == 1 or item.public == 'True' %}
+                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
+                        опубликована
+                    </div>
+                    {% else %}
+                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
+                        приватная
+                    </div>
+                    {% endif %}
+                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
+                                                style="border-radius: 22px">
+                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
+                    </div>
+                    <div class="like" style="margin-top:5%; margin-left:1%">
                         <a type="button"
-                           href="/new_like/{{current_user.id}}/{{item.id}}/publications">
+                           href="/new_like/{{current_user.id}}/{{item.id}}/diary">
                             {% if emotion_pop[loop.index0]['is_like'] %}
                             <img src="../static/img/like_add.png" width="117" height="100">
                             {% else %}
@@ -83,32 +98,17 @@
                             {% endif %}
                         </a>
                         {% if emotion_pop[loop.index0]['like'] != None %}
-                        <p style="color:#ffffff">{{emotion_pop[loop.index0]['like']}}</p>
+                        <p style="color:#ffffff; margin-left:30%">{{emotion_pop[loop.index0]['like']}}</p>
                         {% endif %}
                     </div>
-                    {% endif %}
-                    {% if emotion_pop[loop.index0]['link'] != None %}
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Ссылки</strong>
-                        </summary>
-                        <p></p>
-                        {% for item2 in emotion_pop[loop.index0]['link'] %}
-                        <div class="link">
-                            <a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
-                                {{ loop.index }}</a>
-                        </div>
-                        <p></p>
-                        {% endfor %}
-                    </details>
-                    {% endif %}
-                    <div class="author" style="style=position:absolute; width:148px; height:44px; left:255px; -webkit-border-radius:
-             22px;-moz-border-radius: 22px;border-radius: 22px; border:2px solid #FFFFFF; background-color:#1daff0; top:
-             98px;"><img src="../{{ emotion_pop[loop.index0]['author'].photo }}" width="40" height="40"
-                         style="border-radius: 22px">
-                        <strong style="color: #ffffff">{{ emotion_pop[loop.index0]['author'].name }}</strong>
+                    <div>
+                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
+                            Изменить
+                        </a>
+                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
+                            Удалить
+                        </a>
                     </div>
-                    <strong style="color:#ffffff">{{item.date}}</strong>
                 </div>
                 {% endfor %}
             </div>
@@ -120,64 +120,79 @@
         </div>
     </td>
     <td id="row2">
-        <div id="row2_div">
+        <div id="row2_div" style="margin-left:50%">
             <h2 class="post_zag">Свежее</h2>
             <div class="fresh_block" id="fresh">
                 {% if fresh_post != [] %}
                 {% for item in fresh_post %}
-                <div class="card-body post">
-                    <details>
-                        <summary>
-                            {% if item.name != None %}
-                            <h3 class="card-title post_zag" style="color:#c5f1ff">{{item.name}}</h3>
-                            {% endif %}
-                        </summary>
-                        {% if item.text != None %}
-                        <strong class="card-text" style="color:#ffffff">{{item.text}}</strong>
-                        {% endif %}
-                    </details>
-                    {% if emotion_fresh[loop.index0]['pos_emot'] != None %}
-                    <div class="pos_emot">
-                        <details>
-                            <summary class="emot_block">
-                                <strong class="emot_block">Позитивные эмоции</strong>
-                            </summary>
-                            <p></p>
-                            {% for item2 in emotion_fresh[loop.index0]['pos_emot'] %}
-                            <strong class="alert alert-success" role="alert"
-                                    style="border-radius: 22px;">{{item2}}</strong>
-                            {% endfor %}
-                        </details>
-                    </div>
-                    <p></p>
-                    {% endif %}
-                    {% if emotion_fresh[loop.index0]['nig_emot'] != None %}
-                    <div class="nig_emot">
-                        <details>
-                            <summary class="emot_block">
-                                <strong class="emot_block">Негативные эмоции</strong>
-                            </summary>
-                            <p></p>
-                            {% for item2 in emotion_fresh[loop.index0]['nig_emot'] %}
-                            <strong class="alert alert-danger" role="alert"
-                                    style="border-radius: 22px;">{{item2}}</strong>
-                            {% endfor %}
-                        </details>
-                    </div>
-                    <p></p>
-                    {% endif %}
+                 <div class="card" style="width: 25rem;">
                     {% if item.photo != None %}
-                    <p></p>
-                    <div class="photo">
-                        <img width="90%" src="{{ item.photo }}"
-                             style="border-radius: 22px;">
-                    </div>
-                    <p></p>
+                    <img src="{{ item.photo }}" class="card-img-top" alt="...">
                     {% endif %}
-                    {% if current_user.is_authenticated %}
-                    <div class="like">
+                  <div class="card-body">
+                      {% if item.name != None %}
+                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                      {% endif %}
+                      <p><small>{{item.date}}</small></p>
+                      {% if item.text != None %}
+                      <p class="card-text">{{item.text}}</p>
+                      {% endif %}
+                  </div>
+                    <ul class="list-group list-group-flush">
+                      <li class="list-group-item">
+                        {% if emotion_fresh[loop.index0]['pos_emot'] != None %}
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
+                                {% for item2 in emotion_fresh[loop.index0]['pos_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-success" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                            </ul>
+                        {% endif %}
+                      </li>
+                    <li class="list-group-item">
+                        {% if emotion_fresh[loop.index0]['nig_emot'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                                {% for item2 in emotion_fresh[loop.index0]['nig_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-danger" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    <li class="list-group-item">
+                        {% if emotion_fresh[loop.index0]['link'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                                {% for item2 in emotion_fresh[loop.index0]['link'] %}
+                                <li>
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                        {{ loop.index }}</a></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    </ul>
+                    <div class="card-body">
+                    {% if item.public == 1 or item.public == 'True' %}
+                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
+                        опубликована
+                    </div>
+                    {% else %}
+                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
+                        приватная
+                    </div>
+                    {% endif %}
+                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
+                                                style="border-radius: 22px">
+                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
+                    </div>
+                    <div class="like" style="margin-top:5%; margin-left:1%">
                         <a type="button"
-                           href="/new_like/{{current_user.id}}/{{item.id}}/publications">
+                           href="/new_like/{{current_user.id}}/{{item.id}}/diary">
                             {% if emotion_fresh[loop.index0]['is_like'] %}
                             <img src="../static/img/like_add.png" width="117" height="100">
                             {% else %}
@@ -185,32 +200,17 @@
                             {% endif %}
                         </a>
                         {% if emotion_fresh[loop.index0]['like'] != None %}
-                        <p style="color:#ffffff">{{emotion_fresh[loop.index0]['like']}}</p>
+                        <p style="color:#ffffff; margin-left:30%">{{emotion_fresh[loop.index0]['like']}}</p>
                         {% endif %}
                     </div>
-                    {% endif %}
-                    {% if emotion_fresh[loop.index0]['link'] != None %}
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Ссылки</strong>
-                        </summary>
-                        <p></p>
-                        {% for item2 in emotion_fresh[loop.index0]['link'] %}
-                        <div class="link">
-                            <a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
-                                {{ loop.index }}</a>
-                        </div>
-                        <p></p>
-                        {% endfor %}
-                    </details>
-                    {% endif %}
-                    <div class="author" style="style=position:absolute; width:148px; height:44px; left:255px; -webkit-border-radius:
-             22px;-moz-border-radius: 22px;border-radius: 22px; border:2px solid #FFFFFF; background-color:#1daff0; top:
-             98px;"><img src="../{{ emotion_fresh[loop.index0]['author'].photo }}" width="40" height="40"
-                         style="border-radius: 22px">
-                        <strong style="color: #ffffff">{{ emotion_fresh[loop.index0]['author'].name }}</strong>
+                    <div>
+                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
+                            Изменить
+                        </a>
+                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
+                            Удалить
+                        </a>
                     </div>
-                    <strong style="color:#ffffff">{{item.date}}</strong>
                 </div>
                 {% endfor %}
             </div>
@@ -223,103 +223,103 @@
     </td>
     <td id="row3">
         <div id="row3_div">
-            <h2 class="post_zag">Для вас</h2>
+            <h2 class="post_zag" style="margin-top:-5%; margin-left:25%">Для вас</h2>
             {% if for_me_post != [] %}
             {% for item in for_you_post %}
-            <div class="card-body post">
-                <details>
-                    <summary>
-                        {% if item.name != None %}
-                        <h3 class="card-title post_zag" style="color:#c5f1ff">{{item.name}}</h3>
-                        {% endif %}
-                    </summary>
-                    {% if item.text != None %}
-                    <strong class="card-text" style="color:#ffffff">{{item.text}}</strong>
+            <div class="card" style="width: 25rem;">
+                    {% if item.photo != None %}
+                    <img src="{{ item.photo }}" class="card-img-top" alt="...">
                     {% endif %}
-                </details>
-                {% if emotion_for_you[loop.index0]['pos_emot'] != None %}
-                <div class="pos_emot">
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Позитивные эмоции</strong>
-                        </summary>
-                        <p></p>
-                        {% for item2 in emotion_for_you[loop.index0]['pos_emot'] %}
-                        <strong class="alert alert-success" role="alert"
-                                style="border-radius: 22px;">{{item2}}</strong>
-                        {% endfor %}
-                    </details>
-                </div>
-                <p></p>
-                {% endif %}
-                {% if emotion_for_you[loop.index0]['nig_emot'] != None %}
-                <div class="nig_emot">
-                    <details>
-                        <summary class="emot_block">
-                            <strong class="emot_block">Негативные эмоции</strong>
-                        </summary>
-                        <p></p>
-                        {% for item2 in emotion_for_you[loop.index0]['nig_emot'] %}
-                        <strong class="alert alert-danger" role="alert"
-                                style="border-radius: 22px;">{{item2}}</strong>
-                        {% endfor %}
-                    </details>
-                </div>
-                <p></p>
-                {% endif %}
-                {% if item.photo != None %}
-                <p></p>
-                <div class="photo">
-                    <img width="90%" src="{{ item.photo }}"
-                         style="border-radius: 22px;">
-                </div>
-                <p></p>
-                {% endif %}
-                {% if current_user.is_authenticated %}
-                <div class="like">
-                    <a type="button"
-                       href="/new_like/{{current_user.id}}/{{item.id}}/publications">
-                        {% if emotion_for_you[loop.index0]['is_like'] %}
-                        <img src="../static/img/like_add.png" width="117" height="100">
-                        {% else %}
-                        <img src="../static/img/like.png" width="94" height="80">
+                  <div class="card-body">
+                      {% if item.name != None %}
+                      <h4 class="card-title" style="color: #c5f1ff">{{item.name}}</h4>
+                      {% endif %}
+                      <p><small>{{item.date}}</small></p>
+                      {% if item.text != None %}
+                      <p class="card-text">{{item.text}}</p>
+                      {% endif %}
+                  </div>
+                    <ul class="list-group list-group-flush">
+                      <li class="list-group-item">
+                        {% if emotion_for_you[loop.index0]['pos_emot'] != None %}
+                            <ul style="list-style-type: none; margin-left:-15%; margin-top:5%;">
+                                {% for item2 in emotion_for_you[loop.index0]['pos_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-success" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                            </ul>
                         {% endif %}
-                    </a>
-                    {% if emotion_for_you[loop.index0]['like'] != None %}
-                    <p style="color:#ffffff">{{emotion_for_you[loop.index0]['like']}}</p>
-                    {% endif %}
-                </div>
-                {% endif %}
-                {% if emotion_for_you[loop.index0]['link'] != None %}
-                <details>
-                    <summary class="emot_block">
-                        <strong class="emot_block">Ссылки</strong>
-                    </summary>
-                    <p></p>
-                    {% for item2 in emotion_for_you[loop.index0]['link'] %}
-                    <div class="link">
-                        <a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
-                            {{ loop.index }}</a>
+                      </li>
+                    <li class="list-group-item">
+                        {% if emotion_for_you[loop.index0]['nig_emot'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%">
+                                {% for item2 in emotion_for_you[loop.index0]['nig_emot'] %}
+                                <li>
+                                    <div class="emot"><strong class="alert alert-danger" role="alert"
+                                                              style="border-radius: 22px;">{{item2}}</strong></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    <li class="list-group-item">
+                        {% if emotion_for_you[loop.index0]['link'] != None %}
+                        <ul style="list-style-type: none; margin-left:-15%; margin-top:5%; margin-bottom:5%">
+                                {% for item2 in emotion_for_you[loop.index0]['link'] %}
+                                <li>
+                                    <div class="emot"><a class="alert alert-light" role="alert" href="{{ item2 }}" style="border-radius: 22px;">Ссылка
+                                        {{ loop.index }}</a></div>
+                                </li>
+                                {% endfor %}
+                        </ul>
+                        {% endif %}
+                    </li>
+                    </ul>
+                    <div class="card-body">
+                    {% if item.public == 1 or item.public == 'True' %}
+                    <div style="border-radius: 22px; margin-left:-5%; width: 50%" class="alert alert-success pub" role="alert">Запись
+                        опубликована
+                    </div>
+                    {% else %}
+                    <div style="border-radius: 22px; margin-left:-5% width: 50%" class="alert alert-danger private" role="alert">Запись
+                        приватная
+                    </div>
+                    {% endif %}
+                    <div class="my_author"><img src="../{{ current_user.photo }}" width="40" height="40"
+                                                style="border-radius: 22px">
+                        <strong style="color: #ffffff">{{ current_user.name }}</strong>
+                    </div>
+                    <div class="like" style="margin-top:5%; margin-left:1%">
+                        <a type="button"
+                           href="/new_like/{{current_user.id}}/{{item.id}}/diary">
+                            {% if emotion_for_you[loop.index0]['is_like'] %}
+                            <img src="../static/img/like_add.png" width="117" height="100">
+                            {% else %}
+                            <img src="../static/img/like.png" width="94" height="80">
+                            {% endif %}
+                        </a>
+                        {% if emotion_for_you[loop.index0]['like'] != None %}
+                        <p style="color:#ffffff; margin-left:30%">{{emotion_for_you[loop.index0]['like']}}</p>
+                        {% endif %}
+                    </div>
+                    <div>
+                        <a style="border-radius: 15px; margin-top:10%; margin-left:1%" href="/post/{{ item.id }}" class="btn" id="edit_btn">
+                            Изменить
+                        </a>
+                        <a style="border-radius: 15px; margin-top:10%" href="/post_deleted/{{ item.id }}" class="btn btn-danger">
+                            Удалить
+                        </a>
                     </div>
-                    <p></p>
-                    {% endfor %}
-                </details>
-                {% endif %}
-                <div class="author" style="style=position:absolute; width:148px; height:44px; left:255px; -webkit-border-radius:
-             22px;-moz-border-radius: 22px;border-radius: 22px; border:2px solid #FFFFFF; background-color:#1daff0; top:
-             98px;"><img src="../{{ emotion_for_you[loop.index0]['author'].photo }}" width="40" height="40"
-                         style="border-radius: 22px">
-                    <strong style="color: #ffffff">{{ emotion_for_you[loop.index0]['author'].name }}</strong>
                 </div>
-                <strong style="color:#ffffff">{{item.date}}</strong>
+                {% endfor %}
             </div>
-            {% endfor %}
-        </div>
-        {% else %}
-        <div class="bad_centre" style="background-color:#1daff0; border-radius: 22px;color:#ffffff">
-            <p class="hz1">Ничего не нашлось :с</p>
-        </div>
-        {% endif %}
+            {% else %}
+            <div class="bad_centre" style="background-color:#1daff0; border-radius: 22px;color:#ffffff">
+                <p class="hz1">Ничего не нашлось :с</p>
+            </div>
+            {% endif %}
         </div>
     </td>
 </table>