diff --git a/main/auth/profile.php b/main/auth/profile.php
index ce3945c0fd..25674c0f45 100755
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -724,8 +724,9 @@ $url_big_image      = $big_image.'?rnd='.time();
 $show_delete_account_button = api_get_setting('platform_unsubscribe_allowed') == 'true' ? true : false;
 
 if (api_get_setting('allow_social_tool') == 'true') {
-    echo '<div class="row-fluid">';
+    echo '<div class="row">';
         echo '<div class="col-md-3">';
+        echo SocialManager::getSocialUserBlock(api_get_user_id(), 'home');
         echo SocialManager::show_social_menu('home', null, api_get_user_id(), false, $show_delete_account_button);
         echo '</div>';
         echo '<div class="col-md-9">';
diff --git a/main/css/base.css b/main/css/base.css
index 676d93e969..88d6b80eff 100755
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -5343,6 +5343,7 @@ i.size-32.icon-new-work{
   font-size: 12px;
   color: #666;
 }
+/* Items menus sidebar */
 .menu-column .nav li a{
   padding: 5px;
   font-size: 12px;
@@ -5351,6 +5352,14 @@ i.size-32.icon-new-work{
   vertical-align: bottom;
   margin-right: 5px;
 }
+.social-menu .nav li a{
+  padding: 8px;
+  font-size: 12px;
+}
+.social-menu .nav li a img{
+  vertical-align: bottom;
+  margin-right: 5px;
+}
 /* LP SCORM */
 /* Default LP left column values */
 
@@ -5459,33 +5468,44 @@ i.size-32.icon-new-work{
 .question_menu li{
   display: inline-block;
 }
-.btn {
-  background: #3498db;
-  background-image: -webkit-linear-gradient(top, #3498db, #2980b9);
-  background-image: -moz-linear-gradient(top, #3498db, #2980b9);
-  background-image: -ms-linear-gradient(top, #3498db, #2980b9);
-  background-image: -o-linear-gradient(top, #3498db, #2980b9);
-  background-image: linear-gradient(to bottom, #3498db, #2980b9);
-  -webkit-border-radius: 7;
-  -moz-border-radius: 7;
-  border-radius: 7px;
-  font-family: Arial;
-  color: #ffffff;
-  font-size: 17px;
-  padding: 10px 20px 10px 20px;
-  text-decoration: none;
-}
-
-.btn:hover {
-  background: #3cb0fd;
-  background-image: -webkit-linear-gradient(top, #3cb0fd, #3498db);
-  background-image: -moz-linear-gradient(top, #3cb0fd, #3498db);
-  background-image: -ms-linear-gradient(top, #3cb0fd, #3498db);
-  background-image: -o-linear-gradient(top, #3cb0fd, #3498db);
-  background-image: linear-gradient(to bottom, #3cb0fd, #3498db);
-  text-decoration: none;
-}
-
 .actions .form-inline {
     display:inline-block;
 }
+ul.holder{
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+ul.holder li.bit-input input{
+  width: 100%;
+  display: block;
+  height: 38px;
+  padding: 8px 12px;
+  font-size: 14px;
+  line-height: 1.42857;
+  color: #555;
+  background-color: #ffffff;
+  background-image: none;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
+}
+ul.holder li.bit-box{
+  padding: 5px;
+  margin-bottom: 5px;
+  color: #8a6d3b;
+  background-color:#FCF8E3;
+  border: 1px solid #FAEBCC;
+  border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+}
+ul.holder li.bit-box a.closebutton{
+  right: 10px;
+  top: 10px;
+}
+#file-descrtiption.form-control{
+  width: 80%;
+}
\ No newline at end of file
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index d2f45f4f65..5a3a606fab 100755
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -199,8 +199,8 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
 		$form->addElement('hidden','parent_id',$message_id);
 	}
 
-	$form->addText('title', get_lang('Subject'), true, array('class' => 'span4'));
-	$form->addHtmlEditor('content', get_lang('Message'), false, false, array('ToolbarSet' => 'Messages', 'Width' => '95%', 'Height' => '250'));
+	$form->addText('title', get_lang('Subject'), true, array('class' => 'col-md-4'));
+	$form->addHtmlEditor('content', get_lang('Message'), false, false, array('ToolbarSet' => 'Messages', 'Width' => '100%', 'Height' => '250'));
 
 	if (isset($_GET['re_id'])) {
 	    $message_reply_info = MessageManager::get_message_by_id($_GET['re_id']);
@@ -214,16 +214,18 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
 	}
 
 	if (empty($group_id)) {
-        $form->addElement('advanced_settings', get_lang('FilesAttachment').'<span id="filepaths">
+        $form->addElement('advanced_settings','<div  id="filepaths" class="form-group">
                     <div id="filepath_1">
-                        <input type="file" name="attach_1"/><br />
-                        '.get_lang('Description').'&nbsp;&nbsp;<input type="text" name="legend[]" /><br /><br />
+                    <label>'.get_lang('FilesAttachment').'</label>
+                    <input type="file" name="attach_1"/>
+                    <label>'.get_lang('Description').'</label>
+                    <input id="file-descrtiption" type="text" name="legend[]" class="form-control"/>
                     </div>
-                </span>');
+                </div>');
 		$form->addElement('advanced_settings','<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')');
 	}
 
-	$form->addElement('style_submit_button','compose',api_xml_http_response_encode(get_lang('SendMessage')),'class="save"');
+	$form->addElement('style_submit_button','compose',api_xml_http_response_encode('<i class="fa fa-paper-plane"></i> '.get_lang('SendMessage')),'class="btn-success"');
 	$form->setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>');
 
 	if (!empty($group_id) && !empty($message_id)) {
@@ -315,12 +317,13 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $social_avatar_block = SocialManager::getSocialUserBlock($user_id, 'messages');
     //Block Social Menu
     $social_menu_block = SocialManager::show_social_menu('messages');
-    $social_right_content .= '<div class="span9">';
+    $social_right_content .= '<div class="row">';
+    $social_right_content .= '<div class="col-md-12">';
     $social_right_content .= '<div class="actions">';
     $social_right_content .=  '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
     $social_right_content .=  '</div>';
     $social_right_content .=  '</div>';
-    $social_right_content .= '<div class="span9">';
+    $social_right_content .= '<div class="col-md-12">';
 }
 
 // MAIN CONTENT
@@ -367,6 +370,7 @@ if (!isset($_POST['compose'])) {
 }
 if (api_get_setting('allow_social_tool') == 'true') {
     $social_right_content .=  '</div>';
+    $social_right_content .=  '</div>';
 }
 
 $tpl = new Template(get_lang('ComposeMessage'));