diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html
index d1e8db7..2ab204b 100644
--- a/projects/templates/project_detail.html
+++ b/projects/templates/project_detail.html
@@ -164,158 +164,158 @@
             
             
             
-{#            {% if request.user.is_contractor and request.user.contractor_answers.exists and request.user.contractor_answers.first in project.answers.all %}#}
-{#                #}
-{#                #}
-{#                #}
-{#                #}
-{#                #}
-{#                {% with answer=request.user.contractor_answers.first %}#}
-{#                    <div class="candidateBlock disTab">#}
-{#                        <div class="candidate">#}
-{#                            <div class="col-lg-4">#}
-{#                                <a href="#" class="aLinkExe">#}
-{#                                    <div class="imgExecutor">#}
-{#                                        {% if answer.author.avatar %}#}
-{#                                            <img src="{{ answer.author.avatar.url }}" alt="execitor-image">#}
-{#                                        {% else %}#}
-{#                                            <img src="{% static 'img/profile.jpg' %}" alt="execitor-image">#}
-{#                                        {% endif %}#}
-{#                                    </div>#}
-{#                                </a>#}
-{#                                <p class="nameExecutor">#}
-{#                                    <a href="#">{{ answer.author.get_full_name }} [{{ answer.author.username }}]</a>#}
-{#                                </p>#}
-{#                                <p class="navv2">На сайте {{ answer.author.created }}</p>#}
-{#                                #}
-{#                                {% if answer.author|class_name == 'User' %}#}
-{#                                    {% if answer.author.contractor_status == 'free' %}#}
-{#                                        <div class="statusUser">Свободен</div><!-- ............. -->#}
-{#                                    {% endif %}#}
-{#                                {% endif %}#}
-{#                            </div>#}
-{#                            <div class="col-lg-3 retts">#}
-{#                                <ul class="rettList restList2">#}
-{#                                    <li>Рейтинг: <span> 0</span></li>#}
-{#                                    <li>Безопасные сделки: <span> 0</span></li>#}
-{#                                    <li>#}
-{#                                        <a href="javascript:void(0)">Отзывы: #}
-{#                                            <span> + 0</span>#}
-{#                                            <small> 0</small>#}
-{#                                            <mark> - 0</mark>#}
-{#                                        </a>#}
-{#                                    </li>#}
-{#                                </ul>#}
-{#                                #}
-{#                                {% if answer.author|class_name == 'User' %}#}
-{#                                    <div class="sroUser sroExecutor">#}
-{#                                        <div class="iconSRO"></div>#}
-{#                                        <p>Есть допуск СРО</p>#}
-{#                                    </div>#}
-{#                                {% else %}#}
-{#                                    ...#}
-{#                                {% endif %}#}
-{#                            </div>#}
-{#                            <div class="col-lg-2 listCens">#}
-{#                                <p>#}
-{#                                    Цена:#}
-{#                                    <span>{{ answer.budget|intcomma }}</span>#}
-{#                                    <i class="fa fa-rub"></i>#}
-{#                                </p>#}
-{#                                <p>#}
-{#                                    Срок: <span>{{ answer.term }} {{ answer.get_term_type_display|decap }}</span>#}
-{#                                </p>#}
-{#                                <p>Опубликован: {{ answer.created }}</p>#}
-{#                            </div>#}
-{#                            <div class="col-lg-3 retts">#}
-{#                                <a href="{% url 'projects:add-candidate' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink1">#}
-{#                                    Кандидат#}
-{#                                </a>#}
-{#                                <a href="{% url 'projects:offer-order' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink2">#}
-{#                                    предложить проект#}
-{#                                </a>#}
-{#                                <a href="javascript:void(0)" class="candLink candLink3">#}
-{#                                    отказ#}
-{#                                </a>#}
-{#                            </div>#}
-{#                            <div class="gallMini disTab">#}
-{#                                <div class="col-lg-3">#}
-{#                                    <div class="insetCol box-sizing disTab">#}
-{#                                        <div class="imgGal">#}
-{#                                            <div class="imgFigure"></div>#}
-{#                                        </div>#}
-{#                                    </div>#}
-{#                                </div>#}
-{#                                <div class="col-lg-3">#}
-{#                                    <div class="insetCol box-sizing disTab">#}
-{#                                        <div class="imgGal">#}
-{#                                            <div class="imgFigure"></div>#}
-{#                                        </div>#}
-{#                                    </div>#}
-{#                                </div>#}
-{#                                <div class="col-lg-3">#}
-{#                                    <div class="insetCol box-sizing disTab">#}
-{#                                        <div class="imgGal">#}
-{#                                            <div class="imgFigure"></div>#}
-{#                                        </div>#}
-{#                                    </div>#}
-{#                                </div>#}
-{#                                <div class="col-lg-3">#}
-{#                                    <div class="insetCol box-sizing disTab">#}
-{#                                        <div class="imgGal">#}
-{#                                            <div class="imgFigure"></div>#}
-{#                                        </div>#}
-{#                                    </div>#}
-{#                                </div>#}
-{#                            </div>#}
-{#                            <div class="commBlock44 disTab">#}
-{#                                <div class="comm44 disTab">#}
-{#                                    <div class="col-lg-10 col-lg-offset-1">#}
-{#                                        <p class="nameComm">#}
-{#                                            Иванов Петр Иванович #}
-{#                                        </p>#}
-{#                                        <span class="dateComm44">#}
-{#                                            13.01.2016 / 21:05#}
-{#                                        </span>#}
-{#                                        <div class="stars box-sizing">#}
-{#                                            <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#}
-{#                                            <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#}
-{#                                            <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#}
-{#                                            <span class="glyphicon glyphicon-star" aria-hidden="true"></span>#}
-{#                                            <span class="glyphicon glyphicon-star" aria-hidden="true"></span>#}
-{#                                        </div>#}
-{#                                        <p class="textComm44">#}
-{#                                            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio.#}
-{#                                        </p>#}
-{#                                    </div>#}
-{#                                </div>#}
-{#                                <div class="comm44 disTab">#}
-{#                                    <div class="col-lg-10 col-lg-offset-1">#}
-{#                                        <p class="nameComm nameCommAct">#}
-{#                                            Иванов Петр Иванович #}
-{#                                        </p>#}
-{#                                        <span class="dateComm44">#}
-{#                                            13.01.2016 / 21:05#}
-{#                                        </span>#}
-{#                                        <p class="textComm44">#}
-{#                                            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio.#}
-{#                                        </p>#}
-{#                                        <a href="javascript:void(0)" class="answerComm">#}
-{#                                            Ответить#}
-{#                                        </a>#}
-{#                                    </div>#}
-{#                                </div>#}
-{#                            </div>#}
-{#                        </div>#}
-{#                    </div>#}
-{#                {% endwith %}#}
-            
-            
-            
-{#            {% elif request.user.is_contractor and not request.user.contractor_answers.exists %}#}
-            {% if request.user.is_contractor and not request.user.contractor_answers.exists %}
+            {% if False and request.user.is_contractor and request.user.contractor_answers.exists and request.user.contractor_answers.first in project.answers.all %}
+                
+                
+                
+                
+                
+                {% with answer=request.user.contractor_answers.first %}
+                    <div class="candidateBlock disTab">
+                        <div class="candidate">
+                            <div class="col-lg-4">
+                                <a href="#" class="aLinkExe">
+                                    <div class="imgExecutor">
+                                        {% if answer.author.avatar %}
+                                            <img src="{{ answer.author.avatar.url }}" alt="execitor-image">
+                                        {% else %}
+                                            <img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
+                                        {% endif %}
+                                    </div>
+                                </a>
+                                <p class="nameExecutor">
+                                    <a href="#">{{ answer.author.get_full_name }} [{{ answer.author.username }}]</a>
+                                </p>
+                                <p class="navv2">На сайте {{ answer.author.created }}</p>
+                                
+                                {% if answer.author|class_name == 'User' %}
+                                    {% if answer.author.contractor_status == 'free' %}
+                                        <div class="statusUser">Свободен</div><!-- ............. -->
+                                    {% endif %}
+                                {% endif %}
+                            </div>
+                            <div class="col-lg-3 retts">
+                                <ul class="rettList restList2">
+                                    <li>Рейтинг: <span> 0</span></li>
+                                    <li>Безопасные сделки: <span> 0</span></li>
+                                    <li>
+                                        <a href="javascript:void(0)">Отзывы: 
+                                            <span> + 0</span>
+                                            <small> 0</small>
+                                            <mark> - 0</mark>
+                                        </a>
+                                    </li>
+                                </ul>
+                                
+                                {% if answer.author|class_name == 'User' %}
+                                    <div class="sroUser sroExecutor">
+                                        <div class="iconSRO"></div>
+                                        <p>Есть допуск СРО</p>
+                                    </div>
+                                {% else %}
+                                    ...
+                                {% endif %}
+                            </div>
+                            <div class="col-lg-2 listCens">
+                                <p>
+                                    Цена:
+                                    <span>{{ answer.budget|intcomma }}</span>
+                                    <i class="fa fa-rub"></i>
+                                </p>
+                                <p>
+                                    Срок: <span>{{ answer.term }} {{ answer.get_term_type_display|decap }}</span>
+                                </p>
+                                <p>Опубликован: {{ answer.created }}</p>
+                            </div>
+                            <div class="col-lg-3 retts">
+                                <a href="{% url 'projects:add-candidate' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink1">
+                                    Кандидат
+                                </a>
+                                <a href="{% url 'projects:offer-order' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink2">
+                                    предложить проект
+                                </a>
+                                <a href="javascript:void(0)" class="candLink candLink3">
+                                    отказ
+                                </a>
+                            </div>
+                            <div class="gallMini disTab">
+                                <div class="col-lg-3">
+                                    <div class="insetCol box-sizing disTab">
+                                        <div class="imgGal">
+                                            <div class="imgFigure"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-lg-3">
+                                    <div class="insetCol box-sizing disTab">
+                                        <div class="imgGal">
+                                            <div class="imgFigure"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-lg-3">
+                                    <div class="insetCol box-sizing disTab">
+                                        <div class="imgGal">
+                                            <div class="imgFigure"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-lg-3">
+                                    <div class="insetCol box-sizing disTab">
+                                        <div class="imgGal">
+                                            <div class="imgFigure"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="commBlock44 disTab">
+                                <div class="comm44 disTab">
+                                    <div class="col-lg-10 col-lg-offset-1">
+                                        <p class="nameComm">
+                                            Иванов Петр Иванович 
+                                        </p>
+                                        <span class="dateComm44">
+                                            13.01.2016 / 21:05
+                                        </span>
+                                        <div class="stars box-sizing">
+                                            <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
+                                            <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
+                                            <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
+                                            <span class="glyphicon glyphicon-star" aria-hidden="true"></span>
+                                            <span class="glyphicon glyphicon-star" aria-hidden="true"></span>
+                                        </div>
+                                        <p class="textComm44">
+                                            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio.
+                                        </p>
+                                    </div>
+                                </div>
+                                <div class="comm44 disTab">
+                                    <div class="col-lg-10 col-lg-offset-1">
+                                        <p class="nameComm nameCommAct">
+                                            Иванов Петр Иванович 
+                                        </p>
+                                        <span class="dateComm44">
+                                            13.01.2016 / 21:05
+                                        </span>
+                                        <p class="textComm44">
+                                            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio.
+                                        </p>
+                                        <a href="javascript:void(0)" class="answerComm">
+                                            Ответить
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endwith %}
+                
+                
+                
+                
+            {% elif request.user.is_contractor and not request.user.contractor_answers.exists %}
+                
                 
-
                 
                 
                 <form action="{% url 'projects:detail' pk=project.pk %}" method="POST" enctype="multipart/form-data" novalidate>
@@ -418,7 +418,11 @@
                 
                 
             {% elif request.user.is_customer %}
-
+                
+                
+                
+                
+                
                 <div class="exBigBlock disTab">
                     <div class="col-lg-12">
                         <p class="titleEx">Исполнители</p>
@@ -448,7 +452,16 @@
                     <p>Новые исполнители</p>
                 </div>
                 
-
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
                 {% for answer_p in project.answers.all %}
                 <div class="candidateBlock disTab">
                     <div class="candidate">
diff --git a/projects/urls.py b/projects/urls.py
index c16f654..ad497a8 100644
--- a/projects/urls.py
+++ b/projects/urls.py
@@ -4,6 +4,7 @@ from django.views.generic import TemplateView
 from .views import (
     add_candidate,
     contractor_portfolio_create,
+    ContractorPortfolioTrashView,
     ContractorPortfolioUpdateView,
     CustomerProjectCreateView,
     CustomerProjectDeleteView,
@@ -12,9 +13,8 @@ from .views import (
     CustomerProjectTrashView,
     OfferOrderView,
     ProjectComparisonView,
-    ProjectFilterView,
     ProjectDetailWithContractorAnswerView,
-    ContractorPortfolioTrashView,
+    ProjectFilterView,
 )
 
 app_name = 'projects'
diff --git a/projects/views.py b/projects/views.py
index 86a98fb..2ed964c 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -21,6 +21,7 @@ from users.models import User
 from work_sell.models import Picture
 
 from .forms import (
+    ContractorPortfolioTrashForm,
     ContractorProjectAnswerForm,
     CustomerProjectDeleteForm,
     CustomerProjectEditForm,
@@ -31,7 +32,6 @@ from .forms import (
     ProjectFilterForm,
     ProjectFilterRealtyForm,
     RealtyForm,
-    ContractorPortfolioTrashForm,
 )