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,264 +1,269 @@
 {% set base_images = 'http://media.yellowpages.co.th/yellowpages'%}
 <div class="container-fluid">
     <div class="col-xs-12 col-md-8 col-lg-8" >
 
         <div class="row">
             <div class="col-xs-12 col-md-12 col-lg-12">
                 {% if profile.logo %}
                 <div class="col-xs-12 col-md-5 col-lg-5">
                     <img class="img-responsive" src="{% if not profile.logo %} {{ nopic }}
                          {% else %} {{ [base_images,"/logo/",profile.logo]|join }} {% endif %}"/>
                 </div>
                 {% endif %}
                 <div class="col-xs-12 col-md-7 col-lg-7">
                     <h4>{{ profile.custname|raw }}</h4>
                     หมวดหมู่ : <a href="/heading/{{ profile.ypheadingname }}">{{ profile.headingname|raw }}</a><br>
                 </div>
             </div>
         </div>
 
         <div class="row">
             <br>
             <div class="col-xs-12 col-sm-12 col-lg-12">
-                {% trans %} Address {% endtrans %} <a href="/ypsearch?qm=#{{ profile.humanname|raw }}/"><img src="/themes/bootstrap/typ/images/icon-map/icon-pin-map_r.png"></a> <br>
+                {% trans %} Address {% endtrans %}
+                {% if profile.location.lat %}
+                    <a href="/ypsearch?qm=#{{ profile.humanname|raw }}/"><img src="/themes/bootstrap/typ/images/icon-map/icon-pin-map_r.png"></a> <br>
+                {% else %}
+                    <a href="https://www.google.co.th/maps/search/{{ profile.fulladdr|raw }}/" target="_blank"><img src="/themes/bootstrap/typ/images/icon-map/icon-pin-map_r.png"></a> <br>
+                {% endif %}
                 {{ [profile.addr,profile.soi,profile.road,profile.subdistrictname,
                     profile.districtname,profile.cityname,profile.postcode]|join(' ') }}
                 <br><br>
 
                 <div class="row">
                     <div class="col-xs-4 col-sm-3 col-lg-3 ">
                         {% if not profile.telno %}{% else %}{% trans %} Tel {% endtrans %}<br>{% endif %}
                         {% if not profile.fax %}{% else %}{% trans %} Fax {% endtrans %}<br>{% endif %}
                         {% if not profile.email %}{% else %}{% trans %} Email {% endtrans %} <br>{% endif %}
-                        {% if not profile.website %}{% else %}{% trans %} Website {% endtrans %} <br>{% endif %}
+                        {% if not profile.websit %}{% else %}{% trans %} Website {% endtrans %} <br>{% endif %}
                         {% if not profile.workinghours %}{% else %}{% trans %} Work-Time {% endtrans %}{% endif %}
                     </div>
                     <div class="col-xs-8 col-sm-9 col-lg-9">
                         {% if not profile.telno %}
                             {% else %}
                                 {% if type == 'FL' %}
                                     <span>{{ profile.telno.0 }}</span><br>
                                 {% else %}
                                 {% for key, tel in profile.telno %}
                                     {% if loop.last != key+1 %}<a href="tel:{{ tel }}">{{ tel }}</a>{{ " ," }}
                                     {% else %}<a href="tel:{{ tel }}">{{ tel }}</a>{% endif %}
                                 {% endfor %}<br>
                                 {% endif %}
                         {% endif %}
 
                         {% if not profile.fax %}
                         {% else %}
                             {% if type == 'FL' %}
                                 <span>{{ profile.telno.0 }}</span><br>
                             {% else %}
                                 {% for key, tel in profile.telno %}
                                     {% if loop.last != key+1 %}<a href="tel:{{ tel }}">{{ tel }}</a>{{ " ," }}
                                     {% else %}<a href="tel:{{ tel }}">{{ tel }}</a>{% endif %}
                                 {% endfor %}<br>
                             {% endif %}
                         {% endif %}
 
                         {% if not profile.email %}
                         {% else %}
                             {% if type == 'FL' %}
                                 <span>{{ profile.email }}</span><br>
                             {% else %}
                                 <a href="mailto:">{{ profile.email }}</a><br>
 
                             {% endif %}
                         {% endif %}
 
-                        {% if not profile.website %}
+                        {% if not profile.websit %}
                             {% else %}
-                            <a href="{{ profile.website }}" target="_blank">{{ profile.website }}</a><br>
+                            <a href="{{ profile.websit }}" target="_blank">{{ profile.websit }}</a><br>
                         {% endif %}
 
                         {% if not profile.workinghours %}
                             {% else %}
                             {{ profile.workinghours }}<br>
                         {% endif %}
                     </div>
                     <div class="row" style="margin-left: 0px;">
                         <div class="col-xs-12 col-md-12 col-lg-12">
                             {% if not prodescription %}
                                 {% else %}
                                     <br>{% trans %} Product And Service {% endtrans %}<br><br>
                                     {{ prodescription|raw }}<br>
                             {% endif %}
 
                             {% if not profile.brandname %}
                                 {% else %}<br>{% trans %} Branner {% endtrans %} : {{ profile.brandname|replace({"<p>":" ","</p>":" "}) }}
                             {% endif %}
                             <br><br><br>
                             {# TAB #}
                             {% if type == 'FL' %}{% else %}
                             <div class="mobile">
                             <ul class="nav nav-tabs">
                                 {% if profile.picturet1 %}<li class="active"><a data-toggle="tab" href="#home">{% trans %} Picture {% endtrans %}</a></li>{% endif %}
                                 {% if profile.location.lat %}<li {% if not profile.picturet1 %}{{ 'class="active"' }}{% endif %}><a data-toggle="tab" href="#menu1">{% trans %} Digital Map {% endtrans %}</a></li>{% endif %}
                                 {% if profile.printadst %}<li {% if not profile.picturet1 or profile.location.lat %}{{ 'class="active"' }}{% endif %}><a data-toggle="tab" href="#menu2">{% trans %} Advertisement {% endtrans %}</a></li>{% endif %}
                                 {% if profile.promotion %}<li {% if not profile.picturet1 or profile.location.lat or profile.printadst %}{{ 'class="active"' }}{% endif %}><a data-toggle="tab" href="#menu3">{% trans %} Promotion  {% endtrans %}</a></li>{% endif %}
                                 {% if profile.map %}<li {% if not profile.picturet1 or profile.location.lat or profile.printadst or profile.promotion %}{{ 'class="active"' }}{% endif %}><a data-toggle="tab" href="#menu4">{% trans %} Map Picture {% endtrans %}</a></li>{% endif %}
                             </ul>
 
                             <div class="tab-content">
                                 {% if profile.picturet1 %}
                                 <div id="home" class="tab-pane fade in active">
                                     <br>
                                     <div class="row">
                                         {% if profile.picturet1  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet1]|join}}" class="colorbox">
                                                     <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet1]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet2  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet2]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet2]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet3  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet3]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet3]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet4  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet4]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet4]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet5  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet5]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet5]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet6  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet6]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet6]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet7  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet7]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet7]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet8  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet8]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet8]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                         {% if profile.picturet9  %}
                                         <div class="col-xs-4 col-sm-4 col-lg-4">
                                             <a href="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet9]|join}}" class="colorbox">
                                                 <img class="img-responsive" src="{{[base_images,"/products/th/",profile.customerid,"/",profile.picturet9]|join}}"/>
                                             </a>
                                         </div>
                                         {% endif %}
                                     </div>
                                 </div>
                                 {% endif %}
 
                                 {% if profile.location.lat %}
-                                <div id="menu1" {% if not profile.picturet1 %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
+                                <div id="menu1" {% if  profile.picturet1 %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
                                     <br>
                                     <iframe width="100%" height="240" scrolling="no" frameborder="0" src="http://landingpage.yellowpages.co.th/yp_map.php?latitude={{ profile.location.lat }}&amp;longitude={{ profile.location.lon }}&amp;height=240&amp;width=445" allowtransparency="true" marginwidth="0" marginheight="0"></iframe>
                                 </div>
                                 {% endif %}
                                 
                                 {% if profile.printadst %}
-                                <div id="menu2" {% if not profile.picturet1 or profile.location.lat %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
+                                <div id="menu2" {% if  profile.picturet1 or profile.location.lat %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
                                     <div class="row">
                                         <div class="col-xs-12 col-sm-12 col-lg-12">
                                             <br>
                                             <a href="{{[base_images,"/printads/th/",profile.printadst,".jpg"]|join}}" class="colorbox">
                                                 <img class="img-responsive typ-profile-printads" src="{{[base_images,"/printads/th/",profile.printadst,".jpg"]|join}}"/>
                                             </a>
                                         </div>
                                     </div>
                                 </div>
                                 {% endif %}
 
                                 {% if profile.promotion %}
-                                <div id="menu3" {% if not profile.picturet1 or profile.location.lat or profile.printadst %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
+                                <div id="menu3" {% if  profile.picturet1 or profile.location.lat or profile.printadst %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
                                     <br>
                                    <p class="text-center" style="color:#000">{{ profile.promotion }}</p>
                                 </div>
                                 {% endif %}
 
                                 {% if profile.map %}
-                                    <div id="menu4" {% if not profile.picturet1 or profile.location.lat or profile.printadst or profile.map %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
+                                    <div id="menu4" {% if  profile.picturet1 or profile.location.lat or profile.printadst or profile.map %}{{ ' class="tab-pane fade"' }}{% else %}{{ ' class="tab-pane fade in active"' }}{% endif %}>
                                         <div class="row">
                                             <div class="col-xs-12 col-sm-12 col-lg-12">
                                                 <br>
                                                 <a href="{{[base_images,"/printads/th/",profile.printads,".jpg"]|join}}" class="colorbox">
                                                     <img class="img-responsive " src="{{[base_images,"/map/th/",profile.map,".jpg"]|join}}"/>
                                                 </a>
                                             </div>
                                         </div>
                                     </div>
                                 {% endif %}
                             </div>
                             </div>
 
                             {% endif %}
 
                             {#<br><br><br>#}
                             {#{% if not profile.custname %}#}
                                 {#{% else %}#}
                                 {#{{ profile.custname|raw }} : แสดงความคิดเห็น#}
                             {#{% endif %}#}
                             {#<br><br>#}
 
                             {# TAB #}
                             {#<div class="mobile">#}
                                 {#<ul class="nav nav-tabs">#}
                                     {#<li class="active"><a data-toggle="tab" href="#menu">{% trans %} Comment {% endtrans %}</a></li>#}
                                     {#<li><a data-toggle="tab" href="#menu">{% trans %} Picture Concerned {% endtrans %}</a></li>#}
                                     {#&#123;&#35;<li><a data-toggle="tab" href="#menu6">{% trans %} Advertise {% endtrans %}</a></li>&#35;&#125;#}
                                 {#</ul>#}
 
                                 {#<div class="tab-content">#}
                                     {#<div id="menu4" class="tab-pane fade in active">#}
                                         {#<h3>HOME</h3>#}
                                         {#<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>#}
                                     {#</div>#}
                                     {#<div id="menu5" class="tab-pane fade">#}
                                         {#<h3>Menu 1</h3>#}
                                         {#<p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>#}
                                     {#</div>#}
                                     {#&#123;&#35;<div id="menu6" class="tab-pane fade">&#35;&#125;#}
                                         {#&#123;&#35;<h3>Menu 2</h3>&#35;&#125;#}
                                         {#&#123;&#35;<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam.</p>&#35;&#125;#}
                                     {#&#123;&#35;</div>&#35;&#125;#}
                                 {#</div>#}
                             {#</div>#}
                             {# END TAB #}
                             <br><br>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="col-xs-12 col-md-4 col-lg-4">
         <div class="col-xs-12 col-md-12 col-lg-12">
 
         </div>
     </div>
 </div>