diff --git a/quiqqer/teampage/src/QUI/TeamPage/Controls/Team.ListStyle.html b/quiqqer/teampage/src/QUI/TeamPage/Controls/Team.ListStyle.html
index 6ba38e5b92a351357bfb8cc4029c8f0e1f4e9067..5b035b82fa4af4dad3e8de00e777473768714666 100644
--- a/quiqqer/teampage/src/QUI/TeamPage/Controls/Team.ListStyle.html
+++ b/quiqqer/teampage/src/QUI/TeamPage/Controls/Team.ListStyle.html
@@ -39,85 +39,82 @@
                         <div itemprop="jobTitle" class="text-muted text-grey-dark mb-4">{$memberData['userPosition']}</div>
                     </header>
 
-                    {assign var=userText value=$memberData['userText']|json_decode:1}
-                    {if (isset($userText[$Project->getLang()]) && $userText[$Project->getLang()] != "")}
-                    <div class="team-page-entry-text">
-                        {$userText[$Project->getLang()]}
+                    {if $this->getAttribute('showShort')}
+                        {assign var=userText value=$memberData['userText']|json_decode:1}
+                        {if (isset($userText[$Project->getLang()]) && $userText[$Project->getLang()] != "")}
+                        <div class="team-page-entry-text-short">
+                            {$userText[$Project->getLang()]}
 
-                        {if $memberData['userLink'] != "" && $buttonType == 'inline'}
-                        <a class="team-page-entry-text-button team-page-entry-text-button__inline" href="{$memberData['userLink']}">
-                            {locale group="quiqqer/teampage" var="teamPage.moreButton.inline"}
-                        </a>
-                        {/if}
-                    </div>
+                            {if $memberData['userLink'] != "" && $buttonType == 'inline'}
+                            <a class="team-page-entry-text-button team-page-entry-text-button__inline" href="{$memberData['userLink']}">
+                                {locale group="quiqqer/teampage" var="teamPage.moreButton.inline"}
+                            </a>
+                            {/if}
+                        </div>
 
-                    {*<!-- fix for non multi lingual user text --> *}
-                    {elseif $memberData['userText']|json_decode:1 === null && $memberData['userText'] !== ''}
-                    <div class="team-page-entry-text">
-                        {$memberData['userText']}
+                        {*<!-- fix for non multi lingual user text --> *}
+                        {elseif $memberData['userText']|json_decode:1 === null && $memberData['userText'] !== ''}
+                        <div class="team-page-entry-text-short">
+                            {$memberData['userText']}
 
-                        {if $memberData['userLink'] != "" && $buttonType == 'inline'}
-                        <a class="team-page-entry-text-button team-page-entry-text-button__inline" href="{$memberData['userLink']}">
-                            {locale group="quiqqer/teampage" var="teamPage.moreButton.inline"}
-                        </a>
+                            {if $memberData['userLink'] != "" && $buttonType == 'inline'}
+                            <a class="team-page-entry-text-button team-page-entry-text-button__inline" href="{$memberData['userLink']}">
+                                {locale group="quiqqer/teampage" var="teamPage.moreButton.inline"}
+                            </a>
+                            {/if}
+                        </div>
                         {/if}
-                    </div>
                     {/if}
 
-                    <div class="team-page-entry-contact-box">
-                        {if $this->getAttribute('showPhone') && $memberData['userPhone']}
-                        <div class="team-page-entry-phones team-page-entry-border">
-                            <i class="fa fa-phone team-page-entry-phones-icon"></i>
-                            <span itemprop="telephone">{$memberData['userPhone']}</span>
+                    {if $this->getAttribute('showLong')}
+                        {assign var=userTextLong value=$memberData['userTextLong']|json_decode:1}
+                        {if (isset($userTextLong[$Project->getLang()]) && $userTextLong[$Project->getLang()] != "")}
+                        <div class="team-page-entry-text-long">
+                            {$userTextLong[$Project->getLang()]}
+
+                            {if $memberData['userLink'] != "" && $buttonType == 'inline'}
+                            <a class="" href="{$memberData['userLink']}">
+                                {locale group="quiqqer/teampage" var="teamPage.moreButton.inline"}
+                            </a>
+                            {/if}
                         </div>
                         {/if}
+                    {/if}
 
-                        {if $memberData['userMail'] && !$memberData['userFacebook'] &&
-                            !$memberData['userTwitter'] && !$memberData['userGoogle'] &&
-                            !$memberData['userLinkedin'] && !$memberData['userXing']}
-                            <div class="team-page-entry-phones">
-                                <i class="fa fa-envelope team-page-entry-social-icon"></i>
-                                <span itemprop="email">{$memberData['userMail']}</span>
-                            </div>
-
-                        {else}
-
-                            {if $this->getAttribute('showSocial')}
-                            <div class="team-page-entry-social">
-                                {if $memberData['userFacebook']}
-                                <a itemprop="url" href="http://{$memberData['userFacebook']}"
-                                   class="team-page-entry-social-link team-page-entry-social-link__facebook">
-                                    <i class="fa fa-facebook team-page-entry-social-icon"></i>
-                                </a>
-                                {/if}
-                                {if $memberData['userTwitter']}
-                                <a itemprop="url" href="http://{$memberData['userTwitter']}"
-                                   class="team-page-entry-social-link team-page-entry-social-link__twitter">
-                                    <i class="fa fa-twitter team-page-entry-social-icon"></i>
-                                </a>
-                                {/if}
-                                {if $memberData['userLinkedin']}
-                                <a itemprop="url" href="http://{$memberData['userLinkedin']}"
-                                   class="team-page-entry-social-link team-page-entry-social-link__linkedin">
-                                    <i class="fa fa-linkedin team-page-entry-social-icon"></i>
-                                </a>
-                                {/if}
-                                {if $memberData['userXing']}
-                                <a itemprop="url" href="http://{$memberData['userXing']}"
-                                   class="team-page-entry-social-link team-page-entry-social-link__xing">
-                                    <i class="fa fa-xing team-page-entry-social-icon"></i>
-                                </a>
-                                {/if}
-                                {if $memberData['userMail']}
-                                <a itemprop="email" href="mailto:{$memberData['userMail']}"
-                                   class="team-page-entry-social-link team-page-entry-social-link__email">
-                                    <i class="fa fa-envelope team-page-entry-social-icon"></i>
-                                </a>
-                                {/if}
-                            </div>
-                            {/if}
+                    {if $this->getAttribute('showSocial')}
+                    <div class="team-page-entry-social">
+                        {if $memberData['userFacebook']}
+                        <a itemprop="url" class="team-page-entry-social-link team-page-entry-social-link__facebook"
+                           href="{$memberData['userFacebook']}" target="_blank">
+                            <span class="fa fa-fw fa-facebook team-page-entry-social-link-icon"></span>
+                        </a>
+                        {/if}
+                        {if $memberData['userTwitter']}
+                        <a itemprop="url" class="team-page-entry-social-link team-page-entry-social-link__twitter"
+                           href="{$memberData['userTwitter']}" target="_blank">
+                            <span class="fa fa-fw fa-twitter team-page-entry-social-link-icon"></span>
+                        </a>
+                        {/if}
+                        {if $memberData['userLinkedin']}
+                        <a itemprop="url" class="team-page-entry-social-link team-page-entry-social-link__linkedin"
+                           href="{$memberData['userLinkedin']}" target="_blank">
+                            <span class="fa fa-fw fa-linkedin team-page-entry-social-link-icon"></span>
+                        </a>
+                        {/if}
+                        {if $memberData['userXing']}
+                        <a itemprop="url" class="team-page-entry-social-link team-page-entry-social-link__xing"
+                           href="{$memberData['userXing']}" target="_blank">
+                            <span class="fa fa-fw fa-xing team-page-entry-social-link-icon"></span>
+                        </a>
+                        {/if}
+                        {if $this->getAttribute('showEmail') && $memberData['userMail']}
+                        <a itemprop="email" class="team-page-entry-social-link team-page-entry-social-link__email"
+                           href="mailto:{$memberData['userMail']}" target="_blank">
+                            <span class="fa fa-fw fa-envelope team-page-entry-social-link-icon"></span>
+                        </a>
                         {/if}
                     </div>
+                    {/if}
 
                     {if $memberData['userLink'] != "" && $buttonType == 'button'}
                     <div class="team-page-entry-text-button-container">