diff --git a/templates/typ-profile.html.twig b/templates/typ-profile.html.twig
--- a/templates/typ-profile.html.twig
+++ b/templates/typ-profile.html.twig
@@ -1,229 +1,229 @@
 {% set base_images = 'http://media.yellowpages.co.th/yellowpages' %}
 {% set base_promotion = promotion.baseurl %}
 
 
 
 <div class="margin-tb-fifteen padding-lr-thity typ-profile-freelist col-md-12 col-sm-12 col-xs-12 ">
 
     <div class="no-gutter col-md-12 col-sm-12 col-xs-12">
         {% if profile.logo %}
             <div class="typ-medium-img col-md-3 col-sm-3 col-xs-12"> {#logo#}
                 <img class="img-responsive" src="{{ profile.logo }}"/>
             </div>
         {% else %}
             <div class="typ-medium-img col-md-3 col-sm-3 col-xs-12">
                 <img class="img-responsive" src="{{ '/themes/contrib/typtheme/images/logo/typ-map-default.jpg' }}"/>
             </div> {#end logo#}
         {% endif %}
 
         <div class="col-md-7 col-sm-7 col-xs-6">
             <h1>{{ profile.humanname|raw }}</h1>
             {% if profile.districtname or profile.cityname %}
                 {{ [profile.districtname,profile.cityname]|join(' ') }}
             {% endif %}
             {% if profile.headings %}
                 <p class="typ-txt-bold">
                     {% trans %}Category{% endtrans %} :
                     {% for key, heading in profile.headings %}
                         {% if loop.last %}
                             <a href="{{ base_path }}heading/{{ heading.headingname }}">{{ heading.headingname|raw }}</a>
                         {% else %}
                             <a href="{{ base_path }}heading/{{ heading.headingname }}">{{ heading.headingname|raw }}</a>,
                         {% endif %}
                     {% endfor %}
                 </p>
             {% endif %}
         </div>
         <div class="col-md-2 col-sm-2 col-xs-6">
             <p>{% trans %} Views {% endtrans %} : xxxxx </p>
         </div>
     </div>
 
     {#description#}
     <div class="margin-top-thirty col-md-12 col-sm-12 col-xs-12 typ-profile-freelist-desc">
         {% if profile.profile %}
             <p>{{ profile.profile|raw }}</p>
         {% endif %}
         {% if profile.proddesc %}
             <strong>{% trans %} Product And Service {% endtrans %}</strong>
             <p>{{ profile.proddesc|raw }}</p>
         {% endif %}
         {% if profile.brandname %}
             <strong>{% trans %}Brand Name{% endtrans %}</strong>
             <p>{{ profile.brandname|replace({"<p>":" ","</p>":" "}) }}</p>
         {% endif %}
     </div> {#end description#}
 
     {#picture#}
     {% if profile.pictures %}
         <div class="typ-profile-img margin-top-thirty col-md-12 col-sm-12 col-xs-12">
             <ul class="no-gutter">
                 {% for key, picture in profile.pictures %}
                     <li>
                         <img src="{{ picture.file }}" alt="" />
                     </li>
                 {% endfor %}
             </ul>
         </div>
     {% endif %}
     {#end picture#}
 
     {#contact#}
-    <div class="typ-profile-contact margin-top-thirty col-md-12 col-sm-12 col-xs-12">
+    <div class="typ-address-content margin-top-thirty col-md-12 col-sm-12 col-xs-12">
         <h1>{% trans %} Contact Information {% endtrans %}</h1>
 
         {#Business Name.#}
         {% if profile.humanname %}
-            <div class="typ-profile-contact-detail col-md-12 col-sm-12 col-xs-12">
+            <div class="typ-address-detail col-md-12 col-sm-12 col-xs-12">
                 <div class="col-md-3 col-sm-3 col-xs-12">
                     <p class="typ-txt-bold">{% trans %} Business Name {% endtrans %}:</p>
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12">
                     {{ profile.humanname }}
                 </div>
             </div>
         {% endif %}
 
         {#address#}
-        <div class="typ-profile-contact-detail col-md-12 col-sm-12 col-xs-12">
+        <div class="typ-address-detail col-md-12 col-sm-12 col-xs-12">
             <div class="col-md-3 col-sm-3 col-xs-12">
                 <p class="typ-txt-bold">{% trans %} Address {% endtrans %}:</p>
             </div>
             <div class="col-md-9 col-sm-9 col-xs-12">
                 {{ [profile.addr,profile.soi,profile.road,profile.subdistrictname,profile.districtname,profile.cityname,profile.postcode]|join(' ') }}
             </div>
         </div>
 
         {#tel.#}
         {% if profile.telno %}
-            <div class="typ-profile-contact-detail col-md-12 col-sm-12 col-xs-12">
+            <div class="typ-address-detail col-md-12 col-sm-12 col-xs-12">
                 <div class="col-md-3 col-sm-3 col-xs-12">
                     <p class="typ-txt-bold">{% trans %} Tel {% endtrans %}:</p>
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12">
                     {% if profile.telno %}
                         {% for key, tel in profile._format.telno %}
                             {% if loop.last %}
                                 <a href='tel:{{ tel }}'>{{ tel }}</a>
                             {% else %}
                                 <a href='tel:{{ tel }}'>{{ tel }}</a>,
                             {% endif %}
                         {% endfor %}
                     {% endif %}
                 </div>
             </div>
         {% endif %}
 
         {#fax#}
         {% if profile.fax %}
-            <div class="typ-profile-contact-detail col-md-12 col-sm-12 col-xs-12">
+            <div class="typ-address-detail col-md-12 col-sm-12 col-xs-12">
                 <div class="col-md-3 col-sm-3 col-xs-12">
                     <p class="typ-txt-bold">{% trans %} Fax {% endtrans %}:</p>
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12">
                     {% if profile.fax %}
                         {% for key, fax in profile._format.fax %}
                             {% if loop.last %}
                                 <a href="tel:{{ fax }}">{{ fax }}</a>
                             {% else %}
                                 <a href="tel:{{ fax }}">{{ fax }}</a>,
                             {% endif %}
                         {% endfor %}
                     {% endif %}
                 </div>
             </div>
         {% endif %}
 
         {#e-mail#}
         {% if profile.email %}
-            <div class="typ-profile-contact-detail col-md-12 col-sm-12 col-xs-12">
+            <div class="typ-address-detail col-md-12 col-sm-12 col-xs-12">
                 <div class="col-md-3 col-sm-3 col-xs-12">
                     <p class="typ-txt-bold">{% trans %} Email {% endtrans %}:</p>
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12">
                     {% if profile.email %}
                         {% for key , mail in profile.email %}
                             {% if loop.last %}
                                 <a href="mailto:{{ mail }}">{{ mail }}</a>
                             {% else %}
                                 <a href="mailto:{{ mail }}">{{ mail }}</a>,
                             {% endif %}
                         {% endfor %}
                     {% endif %}
                 </div>
             </div>
         {% endif %}
 
         {#website#}
         {% if profile.website %}
-            <div class="typ-profile-contact-detail col-md-12 col-sm-12 col-xs-12">
+            <div class="typ-address-detail col-md-12 col-sm-12 col-xs-12">
                 <div class="col-md-3 col-sm-3 col-xs-12">
                     <p class="typ-txt-bold">{% trans %} Website {% endtrans %}:</p>
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12">
                     {% if profile.website %}
                         {% for key , web in profile.website %}
                             {% if loop.last %}
                                 <a href="{{key|trim }}" target="_blank">{{web}}</a>
                             {% else %}
                                 <a href="{{key|trim}}" target="_blank">{{web}}</a>,
                             {% endif %}
                         {% endfor %}
                     {% endif %}
                 </div>
             </div>
         {% endif %}
 
         {#work-time#}
         {% if profile.workinghours %}
-            <div class="typ-profile-contact-detail col-md-12 col-sm-12 col-xs-12">
+            <div class="typ-address-detail col-md-12 col-sm-12 col-xs-12">
                 <div class="col-md-3 col-sm-3 col-xs-12">
                     <p class="typ-txt-bold">{% trans %} Work-Time {% endtrans %}:</p>
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12">
                     {% if not profile.workinghours %}
                     {% else %}
                         {{ profile._format.workinghours }}
                     {% endif %}
                 </div>
             </div>
         {% endif %}
     </div> {#end contact#}
 
     {#Map#}
     {% if profile.location.lat and profile.location.lon %}
         <div class="margin-top-thirty col-md-12 col-sm-12 col-xs-12">
             <div class="google-map-size">
                 <iframe width="100%" scrolling="no" frameborder="0" src="http://landingpage.yellowpages.co.th/yp_map.php?latitude={{ profile.location.lat }}&amp;longitude={{ profile.location.lon }}&amp;height=420&amp;width=445" allowtransparency="true" marginwidth="0" marginheight="0"></iframe>
                 <div class="text-center">
                     <a class="iframe btn btn-md typ-link-btn" href="http://landingpage.yellowpages.co.th/yp_map.php?bypass=1&latitude={{ profile.location.lat }}&longitude={{ profile.location.lon }}&iframe=true&width=800&height=580">{% trans %}View list on search by map {% endtrans %}</a>
                     <a class="btn btn-md typ-link-btn" target="_blank" href="http://maps.google.com/maps?z=10&t=m&q=loc:{{ profile.location.lat }},{{ profile.location.lon }}">{% trans %} Navigation {% endtrans %}</a>
                 </div>
             </div>
         </div>
     {% endif %}
     {#end Map#}
     <div class="margin-top-thirty col-md-12 col-sm-12 col-xs-12">
         <h3>{% trans %} Comment {% endtrans %}</h3>
         <hr/>
     </div>
     {#facebook#}
     <div class="col-md-12 col-sm-12 col-xs-12">
         {{ app.request.getRequestUri() }}
         <div id="fb-root"></div>
         <script>(function(d, s, id) {
                 var js, fjs = d.getElementsByTagName(s)[0];
                 if (d.getElementById(id)) return;
                 js = d.createElement(s); js.id = id;
                 js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.5&appId=986936604724797";
                 fjs.parentNode.insertBefore(js, fjs);
             }(document, 'script', 'facebook-jssdk'));</script>
         <div class="fb-comments" data-width="100%" data-href="http://{{ facebook_comment }}" data-numposts="5"></div>
     </div> {#end facebook#}
 
 </div> {#end typ profile freelist#}
 
 
 <input type="hidden" class="catname" value="{{ profile.headingname|raw }}">
 <input type="hidden" class="lang" value="{{ profile.lang|raw }}">
 <input type="hidden" class="cat_address" value="{{ [profile.subdistrictname,profile.districtname,profile.cityname,profile.postcode]|join(' ') }}">