diff --git a/src/main/resources/public/css/conference.css b/src/main/resources/public/css/conference.css
index 6bde9bc..3b867c6 100644
--- a/src/main/resources/public/css/conference.css
+++ b/src/main/resources/public/css/conference.css
@@ -1,3 +1,16 @@
+.deadline-list{
+    height: 200px;
+    padding: 0px;
+}
+
+.deadline{
+    margin: 0;
+}
+
+.deadline-text{
+    flex: 1;
+}
+
 .member-list{
     height: 200px;
     padding: 0px;
@@ -5,6 +18,21 @@
 
 .member{
     margin: 0;
+}
+
+.icon{
+    width: 38px;
+    height: 38px;
+    padding: 2px;
+    cursor: pointer;
+}
+
+.icon-edit-input-text{
+    width: 27px;
+    height: 27px;
+}
+
+.grey-border{
     color: #495057;
     background-color: #fff;
     background-clip: padding-box;
diff --git a/src/main/resources/public/img/conference/delete.png b/src/main/resources/public/img/conference/delete.png
new file mode 100644
index 0000000..595bf63
Binary files /dev/null and b/src/main/resources/public/img/conference/delete.png differ
diff --git a/src/main/resources/public/img/conference/edit.png b/src/main/resources/public/img/conference/edit.png
new file mode 100644
index 0000000..832bef3
Binary files /dev/null and b/src/main/resources/public/img/conference/edit.png differ
diff --git a/src/main/resources/templates/conferences/conference.html b/src/main/resources/templates/conferences/conference.html
index 901822f..599c745 100644
--- a/src/main/resources/templates/conferences/conference.html
+++ b/src/main/resources/templates/conferences/conference.html
@@ -23,27 +23,46 @@
                                 <input type="hidden" name="id"/>
                                 <div class="form-group">
                                     <label for="title">Название:</label>
+                                    <img class="icon grey-border float-right icon-edit-input-text"
+                                         src="/img/conference/edit.png" alt="Редактировать"/>
                                     <input class="form-control" id="title" type="text"
-                                           placeholder="Название конференции:"/>
+                                           placeholder="Название конференции"/>
                                 </div>
 
                                 <div class="form-group">
                                     <label for="url">URL:</label>
+                                    <img class="icon grey-border float-right icon-edit-input-text"
+                                         src="/img/conference/edit.png" alt="Редактировать"/>
                                     <input class="form-control" id="url" type="text"
-                                           placeholder="URL адрес:"/>
+                                           placeholder="URL адрес"/>
                                 </div>
 
                                 <div class="form-group">
                                     <label for="description">Описание:</label>
+                                    <img class="icon grey-border float-right icon-edit-input-text"
+                                         src="/img/conference/edit.png" alt="Редактировать"/>
                                     <textarea class="form-control" rows="8" id="description">
                                     </textarea>
                                 </div>
 
                                 <div class="form-group">
-                                    <label>Дедлайны:</label>
+                                    <label for="deadlines">Дедлайны:</label>
+                                    <div class="deadline-list form-control" id="deadlines">
+                                        <div class="row deadline grey-border">
+                                            <input class="form-control deadline-text" type="text"
+                                                   placeholder="Текст дедлайна"/>
+                                            <input type="date"/>
+                                            <img class="icon grey-border" src="/img/conference/edit.png"
+                                                 alt="Редактировать"/>
+                                            <img class="icon grey-border" src="/img/conference/delete.png"
+                                                 alt="Удалить"/>
+                                        </div>
+
+                                    </div>
                                 </div>
-                                <div class="form-group">
-                                    <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
+                                <div class="form-group float-right">
+                                    <input type="submit" id="addDeadline" name="addDeadline"
+                                           class="btn btn-primary float-right"
                                            value="Добавить дедлайн"/>
                                 </div>
                             </div>
@@ -52,9 +71,9 @@
                                     <label for="dates">Дата проведения:</label>
                                     <div class="row" id="dates">
                                         <div class="col">
-                                            <input type="date" id="date-begin" name="date"/>
+                                            <input type="date" id="date-begin"/>
                                             -
-                                            <input type="date" id="date-end" name="date"/>
+                                            <input type="date" id="date-end"/>
                                         </div>
                                     </div>
                                 </div>
@@ -62,22 +81,22 @@
                                 <div class="form-group">
                                     <label for="members">Участники:</label>
                                     <div class="member-list form-control" id="members">
-                                        <div class="row member">
-                                            <div class="col member-name">
+                                        <div class="row member grey-border">
+                                            <div class="col-5 member-name">
                                                 Пользователь 1
                                             </div>
-                                            <div class="col member-participation">
+                                            <div class="col-3 member-participation">
                                                 очная
                                             </div>
                                             <div class="col member-deposit">
                                                 статья
                                             </div>
                                         </div>
-                                        <div class="row member">
-                                            <div class="col member-name">
+                                        <div class="row member grey-border">
+                                            <div class="col-5 member-name">
                                                 Пользователь 2
                                             </div>
-                                            <div class="col member-participation">
+                                            <div class="col-3 member-participation">
                                                 заочная
                                             </div>
                                             <div class="col member-deposit">
@@ -89,7 +108,7 @@
 
 
                                 <div class="form-group">
-                                    <button id="pingButton" class="btn btn-primary text-uppercase"
+                                    <button id="pingButton" class="btn btn-primary float-right"
                                             type="button">
                                         Принять участие
                                     </button>