diff --git a/templates/client/includes/accounts/simple_user.html b/templates/client/includes/accounts/simple_user.html
index f7e39411..24a897d8 100644
--- a/templates/client/includes/accounts/simple_user.html
+++ b/templates/client/includes/accounts/simple_user.html
@@ -18,11 +18,11 @@
             </aside>
             <div class="i-info">
                 <header>
-                    <div class="i-place">
-                    {% if member.profile.country %}
-                        {{ member.profile.country }}, {{ member.profile.city }}
-                    {% endif %}
-                    </div>
+					{% if member.profile.country or member.profile.city%}
+						<div class="i-place">
+						{% if member.profile.country %}{{ member.profile.country }},{% endif %}{% if member.profile.city %} {{ member.profile.city }}{% endif %}
+						</div>
+					{% endif %}
                     <div class="i-title">{{ member.get_full_name }}</div>
                 </header>
 
diff --git a/templates/client/includes/company/company_list.html b/templates/client/includes/company/company_list.html
index dec449a1..97b4ae5d 100644
--- a/templates/client/includes/company/company_list.html
+++ b/templates/client/includes/company/company_list.html
@@ -41,13 +41,15 @@
                     {% if company.get_events %}
 					<a class="button blue icon-list" href="/expositions/member-{{ company.url }}">{% trans 'события' %} ({{ company.get_events_number }})</a>
                     {% endif %}
+					{% comment %}
 					<a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
+					{% endcomment %}
 				</div>
 
 				<div class="cli-s-buttons">
-                    <!--
+					{% comment %}
 					<a class="button icon-msg" href="#">{% trans 'отправить сообщение' %}</a>
-					-->
+					{% endcomment %}
 				</div>
 			</div>