diff --git a/main/inc/lib/auth.lib.php b/main/inc/lib/auth.lib.php
index cd978c0293..42720b1e8a 100644
--- a/main/inc/lib/auth.lib.php
+++ b/main/inc/lib/auth.lib.php
@@ -429,8 +429,7 @@ class Auth
         $tbl_course               = Database::get_main_table(TABLE_MAIN_COURSE);
         $TABLE_COURSE_FIELD       = Database::get_main_table(TABLE_MAIN_COURSE_FIELD);
         $TABLE_COURSE_FIELD_VALUE = Database::get_main_table(TABLE_MAIN_COURSE_FIELD_VALUES);
-        $table_course_ranking       = Database::get_main_table(TABLE_STATISTIC_TRACK_COURSE_RANKING);
-        
+                
 
         // get course list auto-register
         $sql = "SELECT course_code FROM $TABLE_COURSE_FIELD_VALUE tcfv INNER JOIN $TABLE_COURSE_FIELD tcf ON tcfv.field_id = tcf.id 
@@ -487,10 +486,8 @@ class Auth
                 
                 if ($row['tutor_name'] == '0') {
                     $row['tutor_name'] = get_lang('NoManager');
-                }
-                
-                $point_info = CourseManager::get_course_ranking($row['id'], 0);        
-                
+                }                
+                $point_info = CourseManager::get_course_ranking($row['id'], 0);
                 $courses[] = array(
                                     'real_id'           => $row['id'],
                                     'point_info'		=> $point_info,                                    
@@ -504,6 +501,7 @@ class Auth
                                     'unsubscribe'       => $row['unsubscribe'],
                                     'registration_code' => $row['registration_code'],
                                     'creation_date'     => $row['creation_date'],
+                                    'visibility'        => $row['visibility'],
                                     'count_users'       => $count_users,
                                     'count_connections' => $count_connections_last_month
                                   );
diff --git a/main/template/default/auth/courses_categories.php b/main/template/default/auth/courses_categories.php
index 7c504d98ee..a5f41949d0 100644
--- a/main/template/default/auth/courses_categories.php
+++ b/main/template/default/auth/courses_categories.php
@@ -31,15 +31,13 @@ $stok = Security::get_token();
 
 <?php if (intval($_GET['hidden_links']) != 1) { ?>
 
-<div id="actions" class="actions">
-	<span id="categories-search">
-    	<form class="course_list" method="post" action="<?php echo api_get_self(); ?>?action=subscribe&amp;hidden_links=0">            
-        	<input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
-            <input type="hidden" name="search_course" value="1" />
-            <input type="text" name="search_term" value="<?php echo (empty($_POST['search_term']) ? '' : api_htmlentities(Security::remove_XSS($_POST['search_term']))); ?>" />
-            &nbsp;<button class="search" type="submit"><?php echo get_lang('SearchCourse'); ?></button>
-		</form>
-	</span>
+<div class="actions">
+    <form class="form-search" method="post" action="<?php echo api_get_self(); ?>?action=subscribe&amp;hidden_links=0">            
+        <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
+        <input type="hidden" name="search_course" value="1" />
+        <input type="text" name="search_term" value="<?php echo (empty($_POST['search_term']) ? '' : api_htmlentities(Security::remove_XSS($_POST['search_term']))); ?>" />
+        &nbsp;<button class="search" type="submit"><?php echo get_lang('SearchCourse'); ?></button>
+    </form>	
 </div>
 <?php 
     $hidden_links = 0;
@@ -51,12 +49,7 @@ $stok = Security::get_token();
     <div class="span3">
         <div class="well">
             <?php 
-            if (!empty($browse_course_categories)) {
-                /*if ($action == 'display_random_courses') { 
-                    echo '<strong>'.get_lang('RandomPick').'</strong>';
-                    $code = '';
-                } else {                    
-                }*/
+            if (!empty($browse_course_categories)) {                    
                 echo '<a class="btn" href="'.api_get_self().'?action=display_random_courses">'.get_lang('RandomPick').'</a><br /><br />';
                 
                 // level 1
@@ -110,6 +103,7 @@ $stok = Security::get_token();
             ?>
         </div>
     </div>
+    
     <div class="span9">
         <?php 
         if (!empty($message)) { Display::display_confirmation_message($message, false); }         
@@ -140,8 +134,7 @@ $stok = Security::get_token();
                 
                 $rating = Display::return_rating_system('star_'.$course['real_id'], $ajax_url.'&amp;course_id='.$course['real_id'], $course['point_info']);
                 
-                echo '<div class="well_border"><div class="row">';
-                
+                echo '<div class="well_border"><div class="row">';                
                     echo '<div class="span2">';
                         echo '<div class="thumbnail">';                
                         if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
@@ -159,8 +152,8 @@ $stok = Security::get_token();
                     
                     echo '<p>';
                     // we display the icon to subscribe or the text already subscribed
-                    if (!in_array($course['code'], $user_coursecodes)) {
-                        
+                    
+                    if (!in_array($course['code'], $user_coursecodes) || empty($user_coursecodes)) {                        
                         if ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD || ($course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM && !api_is_anonymous())) {
                              echo '<a class="btn btn-primary" href="'.  api_get_course_url($course['code']).'">'.get_lang('GoToCourse').'</a>';
                         } else {