diff --git a/app/Resources/public/css/themes/rainbow/default.css b/app/Resources/public/css/themes/rainbow/default.css
index e08d2e64b4..132ea03547 100755
--- a/app/Resources/public/css/themes/rainbow/default.css
+++ b/app/Resources/public/css/themes/rainbow/default.css
@@ -549,11 +549,17 @@ legend{
     padding-right: 10px;
     padding-top: 5px;
 }
+#carousel-announcement .carousel-indicators li{
+    border: 1px solid #162A83;
+}
 @media (max-width: 480px) {
     .item-menu{
         width: 100%;
         text-align: center;
     }
+    #carousel-announcement{
+        min-height: auto;
+    }    
 }
 
 .required:before {
diff --git a/main/template/rainbow/social/avatar_block.tpl b/main/template/rainbow/social/avatar_block.tpl
index 2d5e8d2a8a..2a813f7d2f 100644
--- a/main/template/rainbow/social/avatar_block.tpl
+++ b/main/template/rainbow/social/avatar_block.tpl
@@ -1,22 +1,25 @@
-<div class="social-profile text-center">
-    {% if show_group %}
-        <img src="{{ user_group_image.file }}" class="img-profile img-responsive img-circle">
-        <div class="caption">
-            <h4 class="group-title">
-                <a href="{{ _p.web_main ~ 'social/group_view.php?id=' ~ group_id }}">{{ user_group.name }}</a>
-            </h4>
-            <p class="group-description">{{ user_group.description }}</p>
-            {% if user_is_group_admin %}
-                <div id="edit_image">
-                    <a class="btn btn-default" href="{{ _p.web_main ~ 'social/group_edit.php?id=' ~ group_id }}">
-                        {{ 'EditGroup'|get_lang }}
-                    </a>
-                </div>
-            {% endif %}
-        </div>
-    {% elseif show_user %}
-        <a href="{{ user_image.big }}" class="expand-image">
-            <img class="img-responsive img-circle" src="{{ user_image.normal }}">
-        </a>
-    {% endif %}
+<div class="sm-groups">
+    <div class="social-profile text-center">
+        {% if show_group %}
+            <img src="{{ user_group_image.file }}" class="img-responsive">
+            <div class="caption">
+                <h4 class="group-title">
+                    <a href="{{ _p.web_main ~ 'social/group_view.php?id=' ~ group_id }}">{{ user_group.name }}</a>
+                </h4>
+                <p class="group-description">{{ user_group.description }}</p>
+                {% if user_is_group_admin %}
+                    <div id="edit_image" class="buttom-subscribed">
+                        <a class="btn btn-default" href="{{ _p.web_main ~ 'social/group_edit.php?id=' ~ group_id }}">
+                            {{ 'EditGroup'|get_lang }}
+                        </a>
+                    </div>
+                    <br />
+                {% endif %}
+            </div>
+        {% elseif show_user %}
+            <a href="{{ user_image.big }}" class="expand-image">
+                <img class="img-responsive img-circle" src="{{ user_image.big }}">
+            </a>
+        {% endif %}
+    </div>
 </div>
diff --git a/main/template/rainbow/social/form_modals.tpl b/main/template/rainbow/social/form_modals.tpl
index d853e6f0ed..9c6f8adee9 100644
--- a/main/template/rainbow/social/form_modals.tpl
+++ b/main/template/rainbow/social/form_modals.tpl
@@ -21,27 +21,27 @@
 </div>
 
 <script>
-    $(document).on('ready', function() {
-        var $sendInvitationModal = $('#send-invitation-modal');
-        var sendToUser = 0;
+$(document).on('ready', function() {
+    var $sendInvitationModal = $('#send-invitation-modal');
+    var sendToUser = 0;
 
-        $('.btn-to-send-invitation').on('click', function(e) {
-            e.preventDefault();
-            sendToUser = $(this).data('send-to');
-            $sendInvitationModal.modal('show');
-        });
+    $('.btn-to-send-invitation').on('click', function(e) {
+        e.preventDefault();
+        sendToUser = $(this).data('send-to');
+        $sendInvitationModal.modal('show');
+    });
 
-        $('#btn-send-invitation').on('click', function(e) {
-            e.preventDefault();
+    $('#btn-send-invitation').on('click', function(e) {
+        e.preventDefault();
 
-            var $frmSendInvitation = $sendInvitationModal.find('.modal-body form'),
-                url = '{{ _p.web_ajax }}message.ajax.php?a=send_invitation&user_id=' + sendToUser;
+        var $frmSendInvitation = $sendInvitationModal.find('.modal-body form'),
+            url = '{{ _p.web_ajax }}message.ajax.php?a=send_invitation&user_id=' + sendToUser;
 
-            $.get(url, $frmSendInvitation.serialize(), function() {
-                $frmSendInvitation[0].reset();
+        $.get(url, $frmSendInvitation.serialize(), function() {
+            $frmSendInvitation[0].reset();
 
-                window.location.reload();
-            });
+            window.location.reload();
         });
     });
+});
 </script>
diff --git a/main/template/rainbow/social/group_block.tpl b/main/template/rainbow/social/group_block.tpl
index 93f82dc120..d3123dbe64 100644
--- a/main/template/rainbow/social/group_block.tpl
+++ b/main/template/rainbow/social/group_block.tpl
@@ -1 +1 @@
-    {{ social_avatar_block }}
+{{ social_avatar_block }}
diff --git a/main/template/rainbow/social/group_view.tpl b/main/template/rainbow/social/group_view.tpl
index 45642273d8..748628c111 100644
--- a/main/template/rainbow/social/group_view.tpl
+++ b/main/template/rainbow/social/group_view.tpl
@@ -6,10 +6,33 @@
         <div class="sm-groups">
             {{ social_avatar_block }}
             {{ social_menu_block }}
+            
+            <!-- Block chat list -->    
+            <div class="chat-friends">
+                <div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
+                    <div class="panel panel-default">
+                        <div class="panel-heading" role="tab" id="headingOne">
+                            <h4 class="panel-title">
+                                <a role="button" data-toggle="collapse" data-parent="#blocklistFriends" href="#listFriends" aria-expanded="true" aria-controls="listFriends">
+                                    {{ "SocialFriend" | get_lang }}
+                                </a>
+                            </h4>
+                        </div>
+                        <div id="listFriends" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                            <div class="panel-body">
+                                {{ social_friend_block }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            
         </div>
     </div>
     <div class="col-md-9">
+        <div class="sm-groups-content">
         {{ create_link }}
+        
         {% if is_group_member == false %}
             <div class="social-group-details-info">
                 {{ 'Privacy' | get_lang }}
@@ -21,12 +44,20 @@
                 {% endif %}
             </div>
         {% endif %}
-
+        
+        <div class="group-info">
+            <h2 class="title">{{ group_info.name }}</h2>
+            <p class="description">{{ group_info.description }}</p>
+        </div>
+        <div class="group-list">
+            {{ social_forum }}
+        </div>
+        
         {{ social_right_content }}
 
         <div id="display_response_id" class="col-md-5"></div>
         {{ social_auto_extend_link }}
+        </div>
     </div>
-
 </div>
 {% endblock %}
diff --git a/main/template/rainbow/social/group_waiting_list.tpl b/main/template/rainbow/social/group_waiting_list.tpl
index 5378d0af2b..52d3a444be 100644
--- a/main/template/rainbow/social/group_waiting_list.tpl
+++ b/main/template/rainbow/social/group_waiting_list.tpl
@@ -29,9 +29,7 @@
                     </div>
                 </div>
             </div>
-
             {% endfor %}
-
         </div>
         <div id="display_response_id" class="col-md-5"></div>
         {{ social_auto_extend_link }}
diff --git a/main/template/rainbow/social/groups_topics.tpl b/main/template/rainbow/social/groups_topics.tpl
new file mode 100644
index 0000000000..507cc373ab
--- /dev/null
+++ b/main/template/rainbow/social/groups_topics.tpl
@@ -0,0 +1,36 @@
+{% extends template ~ "/layout/layout_1_col.tpl" %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-3">
+            <div class="sm-groups">
+            {{ social_avatar_block }}
+            {{ social_menu_block }}
+
+            <!-- Block chat list -->
+            <div class="chat-friends">
+                <div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
+                    <div class="panel panel-default">
+                        <div class="panel-heading" role="tab" id="headingOne">
+                            <h4 class="panel-title">
+                                <a role="button" data-toggle="collapse" data-parent="#blocklistFriends" href="#listFriends" aria-expanded="true" aria-controls="listFriends">
+                                    {{ "SocialFriend" | get_lang }}
+                                </a>
+                            </h4>
+                        </div>
+                        <div id="listFriends" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                            <div class="panel-body">
+                                {{ social_friend_block }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            </div>
+        </div>
+        <div class="col-md-9">
+            {{ group_message }}
+            {{ social_right_content }}
+        </div>
+    </div>
+{% endblock %}
diff --git a/main/template/rainbow/social/home.tpl b/main/template/rainbow/social/home.tpl
index e1ec5446e2..f3895ee41b 100644
--- a/main/template/rainbow/social/home.tpl
+++ b/main/template/rainbow/social/home.tpl
@@ -4,7 +4,6 @@
     <div class="row">
         <div class="col-md-3">
             {{ social_avatar_block }}
-
             <div class="social-network-menu">
             {{ social_menu_block }}
             </div>
@@ -19,7 +18,7 @@
             {{ social_auto_extend_link }}
         </div>
         <div class="col-md-3">
-        <!-- Block chat list -->    
+            <!-- Block chat list -->
             <div class="chat-friends">
                 <div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
                     <div class="panel panel-default">
@@ -38,34 +37,33 @@
                     </div>
                 </div>
             </div>
-       
-         <!-- Block session list -->
-        {% if sessionList != null %}
-        <div class="panel-group" id="session-block" role="tablist" aria-multiselectable="true">
-            <div class="panel panel-default">
-                <div class="panel-heading" role="tab" id="headingOne">
-                    <h4 class="panel-title">
-                        <a role="button" data-toggle="collapse" data-parent="#session-block" href="#sessionList" aria-expanded="true" aria-controls="sessionList">
-                           {{ "MySessions" | get_lang }}
-                        </a>
-                    </h4>
-                </div>
-                <div id="sessionList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
-                    <div class="panel-body">
-                        <ul class="list-group">
-                            {% for session in sessionList %}
-                            <li id="session_{{ session.id }}" class="list-group-item" style="min-height:65px;">
-                                <img class="img-session" src="{{ session.image }}"/>
-                                <span class="title">{{ session.name }}</span>
-                            </li>
-                            {% endfor %}
-                        </ul>
+
+            <!-- Block session list -->
+            {% if sessionList != null %}
+            <div class="panel-group" id="session-block" role="tablist" aria-multiselectable="true">
+                <div class="panel panel-default">
+                    <div class="panel-heading" role="tab" id="headingOne">
+                        <h4 class="panel-title">
+                            <a role="button" data-toggle="collapse" data-parent="#session-block" href="#sessionList" aria-expanded="true" aria-controls="sessionList">
+                               {{ "MySessions" | get_lang }}
+                            </a>
+                        </h4>
+                    </div>
+                    <div id="sessionList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                        <div class="panel-body">
+                            <ul class="list-group">
+                                {% for session in sessionList %}
+                                <li id="session_{{ session.id }}" class="list-group-item" style="min-height:65px;">
+                                    <img class="img-session" src="{{ session.image }}"/>
+                                    <span class="title">{{ session.name }}</span>
+                                </li>
+                                {% endfor %}
+                            </ul>
+                        </div>
                     </div>
                 </div>
-            </div>
-         </div>
-         {% endif %}
-         
+             </div>
+             {% endif %}
         </div>
     </div>
 {% endblock %}
diff --git a/main/template/rainbow/social/profile.tpl b/main/template/rainbow/social/profile.tpl
index 84907d1364..3ae61d0883 100644
--- a/main/template/rainbow/social/profile.tpl
+++ b/main/template/rainbow/social/profile.tpl
@@ -25,15 +25,15 @@
     </div>
     <div class="col-md-3">
         <div class="chat-friends">
-                <div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
-                    <div class="panel panel-default">
-                        <div class="panel-heading" role="tab" id="headingOne">
-                            <h4 class="panel-title">
-                                <a role="button" data-toggle="collapse" data-parent="#blocklistFriends" href="#listFriends" aria-expanded="true" aria-controls="listFriends">
-                                    {{ "SocialFriend" | get_lang }}
-                                </a>
-                            </h4>
-                        </div>
+            <div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
+                <div class="panel panel-default">
+                    <div class="panel-heading" role="tab" id="headingOne">
+                        <h4 class="panel-title">
+                            <a role="button" data-toggle="collapse" data-parent="#blocklistFriends" href="#listFriends" aria-expanded="true" aria-controls="listFriends">
+                                {{ "SocialFriend" | get_lang }}
+                            </a>
+                        </h4>
+                    </div>
                     <div id="listFriends" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
                         <div class="panel-body">
                             {{ social_friend_block }}
@@ -45,28 +45,28 @@
         {{ social_skill_block }}
         {{ social_group_info_block }}
         <!-- Block course list -->
-         {% if social_course_block != null %}
-         <div class="panel-group" id="course-block" role="tablist" aria-multiselectable="true">
-                    <div class="panel panel-default">
-                        <div class="panel-heading" role="tab" id="headingOne">
-                            <h4 class="panel-title">
-                                <a role="button" data-toggle="collapse" data-parent="#course-block" href="#courseList" aria-expanded="true" aria-controls="courseList">
-                                    {{ "MyCourses" | get_lang }}
-                                </a>
-                            </h4>
-                        </div>
-                    <div id="courseList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
-                        <div class="panel-body">
-                            <ul class="list-group">
-                                {{ social_course_block }}
-                            </ul>
-                        </div>
+        {% if social_course_block != null %}
+        <div class="panel-group" id="course-block" role="tablist" aria-multiselectable="true">
+            <div class="panel panel-default">
+                <div class="panel-heading" role="tab" id="headingOne">
+                    <h4 class="panel-title">
+                        <a role="button" data-toggle="collapse" data-parent="#course-block" href="#courseList" aria-expanded="true" aria-controls="courseList">
+                            {{ "MyCourses" | get_lang }}
+                        </a>
+                    </h4>
+                </div>
+                <div id="courseList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                    <div class="panel-body">
+                        <ul class="list-group">
+                            {{ social_course_block }}
+                        </ul>
                     </div>
                 </div>
             </div>
-         {% endif %}
+        </div>
+        {% endif %}
         <!-- Block session list -->
-        {% if sessionList != null %}
+        {% if session_list != null %}
         <div class="panel-group" id="session-block" role="tablist" aria-multiselectable="true">
             <div class="panel panel-default">
                 <div class="panel-heading" role="tab" id="headingOne">
@@ -79,7 +79,7 @@
                 <div id="sessionList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
                     <div class="panel-body">
                         <ul class="list-group">
-                            {% for session in sessionList %}
+                            {% for session in session_list %}
                             <li id="session_{{ session.id }}" class="list-group-item" style="min-height:65px;">
                                 <img class="img-session" src="{{ session.image }}"/>
                                 <span class="title">{{ session.name }}</span>
@@ -90,13 +90,14 @@
                 </div>
             </div>
          </div>
-         {% endif %}
-
+        {% endif %}
+        {{ invitations }}
         {{ social_rss_block }}
         {{ social_right_information }}
     </div>
 </div>
-    {% if form_modals is defined %}
-        {{ form_modals }}
-    {% endif %}
+
+{% if form_modals is defined %}
+    {{ form_modals }}
+{% endif %}
 {% endblock %}
diff --git a/main/template/rainbow/social/search.tpl b/main/template/rainbow/social/search.tpl
index 18aa446aa2..83ecdea36c 100644
--- a/main/template/rainbow/social/search.tpl
+++ b/main/template/rainbow/social/search.tpl
@@ -9,14 +9,12 @@
         </div>
     </div>
     <div class="col-md-9">
-        
-            <div class="form-search-sm">
-                {{ search_form }}
-            </div>
-            <div class="list-search-sm">
-                {{ social_search }}
-            </div>
-        
+        <div class="form-search-sm">
+            {{ search_form }}
+        </div>
+        <div class="list-search-sm">
+            {{ social_search }}
+        </div>
     </div>
 </div>
 
diff --git a/main/template/rainbow/social/skills_block.tpl b/main/template/rainbow/social/skills_block.tpl
index 7c66d61a83..6eff8e8339 100644
--- a/main/template/rainbow/social/skills_block.tpl
+++ b/main/template/rainbow/social/skills_block.tpl
@@ -1,3 +1,8 @@
+<script>
+jQuery(document).ready(function(){
+    jQuery('.scrollbar-inner').scrollbar();
+});
+</script>
 <div class="panel-group" id="skill-block" role="tablist" aria-multiselectable="true">
     <div class="panel panel-default">
         <div class="panel-heading" role="tab" id="headingOne">
@@ -15,7 +20,6 @@
                                 <a href="{{ _p.web_main ~ 'social/my_skills_report.php' }}"> {{'SkillsReport'|get_lang }}</a>
                             </li>
                         {% endif %}
-
                         <li>
                             <a href="{{ _p.web_main ~ 'social/skills_wheel.php' }}"> {{ 'SkillsWheel'|get_lang }}</a>
                         </li>
@@ -26,30 +30,23 @@
                 </div>
             </h4>
         </div>
-        <script type="text/javascript">
-            jQuery(document).ready(function(){
-            jQuery('.scrollbar-inner').scrollbar();
-        });
-                        </script>                
         <div id="skillList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
             <div class="panel-body">
                 {% if skills %}
-               
-                <div class="scrollbar-inner badges-sidebar">
-                    <ul class="list-unstyled list-badges">
-                        {% for skill in skills %}
-                            <li class="thumbnail">
-                                <a href="{{ _p.web }}badge/{{ skill.id }}/user/{{ user_id }}" target="_blank">
-                                    <img title="{{ skill.name }}" class="img-responsive" src="{{ skill.icon ? skill.web_icon_thumb_path : 'badges-default.png'|icon(64) }}" width="64" height="64" alt="{{ skill.name }}">
-                                    <div class="caption">
-                                        <p class="text-center">{{ skill.name }}</p>
-                                    </div>
-                                </a>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </div>
-                    
+                    <div class="scrollbar-inner badges-sidebar">
+                        <ul class="list-unstyled list-badges">
+                            {% for skill in skills %}
+                                <li class="thumbnail">
+                                    <a href="{{ _p.web }}skill/{{ skill.id }}/user/{{ user_id }}" target="_blank">
+                                        <img title="{{ skill.name }}" class="img-responsive" src="{{ skill.icon ? skill.web_icon_thumb_path : 'badges-default.png'|icon(64) }}" width="64" height="64" alt="{{ skill.name }}">
+                                        <div class="caption">
+                                            <p class="text-center">{{ skill.name }}</p>
+                                        </div>
+                                    </a>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
                 {% else %}
                     <p>{{ 'WithoutAchievedSkills'|get_lang }}</p>
                     <p>
diff --git a/main/template/rainbow/social/user_block.tpl b/main/template/rainbow/social/user_block.tpl
index 607e74f4bb..0382b3c086 100644
--- a/main/template/rainbow/social/user_block.tpl
+++ b/main/template/rainbow/social/user_block.tpl
@@ -1,36 +1,62 @@
-    <div class="sidebar-avatar">
-        <div class="panel-group" id="sn-avatar" role="tablist" aria-multiselectable="true">
-            <div class="panel panel-default">
-                <div class="panel-heading" role="tab" id="heading-sn">
-                    <h4 class="panel-title">
-                        <a role="button" data-toggle="collapse" data-parent="#sn-avatar" href="#sn-avatar-one" aria-expanded="true" aria-controls="sn-avatar-one">
-                        {{ "Role" | get_lang }}
-                        </a>
-                    </h4>
-                </div>
-                <div id="sn-avatar-one" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading-sn">
-                    <div class="panel-body">
-                        
-                        {{ social_avatar_block }}
-                        
-                        <ul class="list-user-data">
+<div class="sidebar-avatar">
+    <div class="panel-group" id="sn-avatar" role="tablist" aria-multiselectable="true">
+        <div class="panel panel-default">
+            <div class="panel-heading" role="tab" id="heading-sn">
+                <h4 class="panel-title">
+                    <a role="button" data-toggle="collapse" data-parent="#sn-avatar" href="#sn-avatar-one" aria-expanded="true" aria-controls="sn-avatar-one">
+                    {{ "Role" | get_lang }}
+                    </a>
+                </h4>
+            </div>
+            <div id="sn-avatar-one" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading-sn">
+                <div class="panel-body">
+                    {{ social_avatar_block }}
+                    <ul class="list-user-data">
+                        <li class="item">
+                            {{ user.complete_name }}
+                        </li>
+                        {% if show_full_profile  %}
                             <li class="item">
-                                {{ user.complete_name }}
+                                <a href="{{ _p.web }}main/messages/new_message.php">
+                                <img src="{{ "instant_message.png" | icon }}" alt="{{ "Email" | get_lang }}">
+                                {{ user.email}}
+                                </a>
                             </li>
-                            {% if vcard_user_link  %}
+                            <li class="item">
+                                <a href="{{ vcard_user_link }}">
+                                <img src="{{ "vcard.png" | icon(16) }}" alt="{{ "BusinessCard" | get_lang }}" width="16" height="16">
+                                {{ "BusinessCard" | get_lang }}
+                                </a>
+                            </li>
+
+                            {% set skype_account = '' %}
+                            {% set linkedin_url = '' %}
+                            {% for extra in user.extra %}
+                                {% if extra.value.getField().getVariable() == 'skype' %}
+                                    {% set skype_account = extra.value.getValue() %}
+                                {% endif %}
+
+                                {% if extra.value.getField().getVariable() == 'linkedin_url' %}
+                                    {% set linkedin_url = extra.value.getValue() %}
+                                {% endif %}
+                            {% endfor %}
+
+                            {% if 'allow_show_skype_account'|get_setting == 'true' and not skype_account is empty %}
                                 <li class="item">
-                                    <a href="{{ _p.web }}main/messages/new_message.php">
-                                    <img src="{{ "instant_message.png" | icon }}" alt="{{ "Email" | get_lang }}">
-                                    {{ user.email}}
+                                    <a href="skype:{{ skype_account }}?chat">
+                                        <span class="fa fa-skype fa-fw" aria-hidden="true"></span> {{ 'Skype'|get_lang }}
                                     </a>
                                 </li>
+                            {% endif %}
+
+                            {% if 'allow_show_linkedin_url'|get_setting == 'true' and not linkedin_url is empty %}
                                 <li class="item">
-                                    <a href="{{ vcard_user_link }}">
-                                    <img src="{{ "vcard.png" | icon(16) }}" alt="{{ "BusinessCard" | get_lang }}" width="16" height="16">
-                                    {{ "BusinessCard" | get_lang }}
+                                    <a href="{{ linkedin_url }}" target="_blank">
+                                        <span class="fa fa-linkedin fa-fw" aria-hidden="true"></span> {{ 'LinkedIn'|get_lang }}
                                     </a>
                                 </li>
                             {% endif %}
+                        {% endif %}
                         {% if chat_enabled == 1 %}
                             {% if user.user_is_online_in_chat != 0 %}
                                 {% if user_relation == user_relation_type_friend %}
@@ -46,20 +72,19 @@
                                 {% endif %}
                             {% endif %}
                         {% endif %}
-                        
-                        {% if not profile_edition_link is empty %}
-                        <li class="item">
-                            <a class="btn link btn-sm btn-block" href="{{ profile_edition_link }}">
-                            <em class="fa fa-edit"></em>{{ "EditProfile" | get_lang }}
-                            </a>
-                        </li>
-                        {% endif %}
-                        
-                        </ul>
-                    </div>
+
+                    {% if not profile_edition_link is empty %}
+                    <li class="item">
+                        <a class="btn btn-link btn-sm btn-block" href="{{ profile_edition_link }}">
+                        <em class="fa fa-edit"></em>{{ "EditProfile" | get_lang }}
+                        </a>
+                    </li>
+                    {% endif %}
+                    </ul>
                 </div>
             </div>
         </div>
     </div>
-                        
+</div>
+
 
diff --git a/main/template/rainbow/social/whoisonline.tpl b/main/template/rainbow/social/whoisonline.tpl
index 16c9b16c9b..09cb2177a4 100644
--- a/main/template/rainbow/social/whoisonline.tpl
+++ b/main/template/rainbow/social/whoisonline.tpl
@@ -14,8 +14,38 @@
                 </div>
             </div>
             <div id="whoisonline">
-                {{ whoisonline }}
+                <div id="user-list" class="row">
+                    {{ whoisonline }}
+                </div>
+                <div class="col-md-12">
+                    <a class="btn btn-large btn-default" id="link_load_more_items" data_link="2" >{{ 'More' | get_lang }}</a>
+                </div>
             </div>
         </div>
     </div>
+    <script>
+        $(document).ready(function() {
+            $("#link_load_more_items").click(function() {
+                page = $("#link_load_more_items").attr("data_link");
+                $.ajax({
+                    beforeSend: function() {
+                        $("#link_load_more_items").html("{{ 'Loading' | get_lang }} <em class='fa fa-spinner fa-pulse fa-fw'></em>");
+                    },
+                    type: "GET",
+                    url: "main/inc/ajax/online.ajax.php?a=load_online_user",
+                    data: "online_page_nr=" + page,
+                    success: function(data) {
+                        if (data != "end") {
+                            $("#link_load_more_items").attr("data_link", parseInt(page) + 1);
+                            $("#user-list").append(data);
+                            $("#link_load_more_items").html("{{ 'More' | get_lang }}");
+                        } else {
+                            $("#link_load_more_items").remove();
+                        }
+                    }
+                });
+            });
+        });
+    </script>
 {% endblock %}
+