diff --git a/main/template/default/auth/courses_list.php b/main/template/default/auth/courses_list.php
index 8f4047b592..cd55a749c4 100755
--- a/main/template/default/auth/courses_list.php
+++ b/main/template/default/auth/courses_list.php
@@ -144,50 +144,50 @@ $courses_without_category = $courses_in_category[0];
 	                        </form>
 	                <?php } else { ?>
 	                        
-	                        <tr><td colspan="2" class="user_course_category">
-	                        <a name="category<?php echo $row['id']; ?>"></a>
-	                        <?php echo $row['title']; ?>
+	                        <tr>
+	                        	<td colspan="2" class="user_course_category">
+	                        	<a name="category<?php echo $row['id']; ?>"></a>
+	                        	<?php echo $row['title']; ?>
 	                <?php } ?>
-	                        </td><td class="user_course_category">
+					</td>
+					
+					<td class="user_course_category">
 	
 	                <!-- display category icons -->
 	                <?php $max_category_key = count($user_course_categories);
-	                if ($action != 'unsubscribe') { ?>
-	                        <table>
-	                        <tr>
-	                        <td>
-	                        <?php if ($row['id'] != $user_course_categories[0]['id']) { ?>
-	                                <a href="courses.php?action=<?php echo $action ?>&amp;move=up&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-	                                <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?>
-	                                </a>
-	                        <?php } ?>
-	                        
-	                        
-	                        </td>
-	                        <td rowspan="2">
+	                if ($action != 'unsubscribe') { ?>               
+	                     	                    
 	                        <a href="courses.php?action=sortmycourses&amp;categoryid=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>#category<?php echo $row['id']; ?>">
 	                        <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
 	                        </a>
-	                        </td>
-	                        <td rowspan=\"2\">
-	                        <a href="courses.php?action=deletecoursecategory&amp;id=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-	                        <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?>
-	                        </a>
-	                        </td>
-	                        </tr>
-	                        <tr>
-	                        <td>
+	                        
+	                        <?php if ($row['id'] != $user_course_categories[0]['id']) { ?>
+	                        	                                <a href="courses.php?action=<?php echo $action ?>&amp;move=up&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
+	                        	                                <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?>
+	                        	                                </a>
+	                        	                        <?php } else { ?>
+	                        	                       		<?php echo Display::return_icon('up_na.png', get_lang('Up'),'',22); ?> 
+	                        	                       <?php } ?>
+	                        	                       
+	                        
+	                        
 	                        <?php if ($row['id'] != $user_course_categories[$max_category_key - 1]['id']) { ?>
-	                                <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-	                                <?php echo Display::return_icon('down.png', get_lang('Down'),'',22); ?>
-	                                </a>
+                                <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
+                                <?php echo Display::return_icon('down.png', get_lang('Down'),'',22); ?>
+                                </a>
+	                        <?php } else { ?>
+
+	                       		<?php echo Display::return_icon('down_na.png', get_lang('Down'),'',22); ?>
 	                        <?php } ?>
-	                        </td>
-	                        </tr>
-	                        </table>
+	                        
+	                        <a href="courses.php?action=deletecoursecategory&amp;id=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
+	                        <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?>
+	                        </a>	                
+	                      
+	                   
 	                <?php } ?>
 	
-	                        </td></tr>
+	                </td></tr>
 	
 	                <!-- Show the courses inside this category -->
 	                <?php
@@ -200,9 +200,10 @@ $courses_without_category = $courses_in_category[0];
 	                            <?php if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
 	                                    $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
 	                            ?>
-	                                    <td>                                        
-	                                    <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" title="<?php echo $icon_title ?>" class="thickbox"><?php echo Display::return_icon('info.png', $icon_title,'','22') ?></a>
-	                                    </td>
+	                            <td>                                        
+	                            	<a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" title="<?php echo $icon_title ?>" class="thickbox"><?php echo Display::return_icon('info.png', $icon_title,'','22') ?>
+	                            	</a>
+								</td>
 	                            <?php } ?>
 	
 	                            <td>
@@ -217,19 +218,14 @@ $courses_without_category = $courses_in_category[0];
 	                            <td valign="top">
 	
 	
-	                            <!-- display course icons -->
-	                            <table><tr><td>
-	                            <?php if ($key > 0) { ?>
-	                                    <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-	                                    <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?>
-	                                    </a>
-	                            <?php } ?>
-	                            </td>
+	                            <!-- edit -->
 	                            
+	                                           
+	                        
+	                           
 	                            <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {
-	                                    $edit_course = Security::remove_XSS($_GET['edit']);
-	                            ?>
-	                                    <td rowspan="2" valign="top">
+	                                    $edit_course = Security::remove_XSS($_GET['edit']); ?>
+	                                  
 	                                        <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
 	                                        <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
 	                                        <input type="hidden" name="course_2_edit_category" value="<?php echo $edit_course; ?>" />
@@ -241,39 +237,59 @@ $courses_without_category = $courses_in_category[0];
 	                                        </select>
 	                                        <button class="save" type="submit" name="submit_change_course_category"><?php echo get_lang('Ok'); ?></button>
 	                                        </form>
-	                                    </td>
-	
 	                            <?php } else { ?>
-	                                    <td rowspan="2" valign="middle"><a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
-	                                    <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
-	                                    </a></td>
+	                                  
 	                            <?php } ?>
-	                            <td rowspan="2" valign="top" class="invisible">
+	                            
+	                            <div style="float:left;"> 
+	                            <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?>
+	                                  <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>   
+                            	<?php } else { ?>	                            
+                                	<a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
+	                                    <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
+	                                    </a>
+                            	<?php } ?>	                                    
+	                            
+	                            <?php if ($key > 0) { ?>
+                                    <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
+                            	    <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?>
+                            	    </a>
+                            	<?php } else { ?>
+                            		<?php echo Display::display_icon('up_na.png', get_lang('Up'),'',22); ?>
+                            	<?php } ?>
+	                    
+	                            <?php if ($key < $number_of_courses - 1) { ?>
+	                                    <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
+	                                    <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
+	                                    </a>
+	                            <?php } else { ?>	
+						       		<?php echo Display::display_icon('down_na.png', get_lang('Down'),'',22); ?>
+								<?php } ?>  
+                            								
+	                          </div>
 	                            <?php if ($course['status'] != 1) {
 	                                    if ($course['unsubscr'] == 1) {
 	                            ?>
-	                                                    
-	                                                    <form action="<?php echo api_get_self(); ?>" method="post" onsubmit="javascript: if (!confirm('<?php echo addslashes(api_htmlentities(get_lang("ConfirmUnsubscribeFromCourse"), ENT_QUOTES, api_get_system_encoding()))?>')) return false">
-	                                                    <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
-	                                                    <input type="hidden" name="unsubscribe" value="<?php echo $course['code']; ?>" />
-	                                                    <input type="image" name="unsub" style="border-color:#fff" src="<?php echo api_get_path(WEB_IMG_PATH); ?>icons/22/unsubscribe_course.png" title="<?php echo get_lang('_unsubscribe') ?>"  alt="<?php echo get_lang('_unsubscribe') ?>" /></form>
+	                                <div style="float:left; margin-right:10px;">           
+									<form action="<?php echo api_get_self(); ?>" method="post" onsubmit="javascript: if (!confirm('<?php echo addslashes(api_htmlentities(get_lang("ConfirmUnsubscribeFromCourse"), ENT_QUOTES, api_get_system_encoding()))?>')) return false">
+                                    	<input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
+                                    	<input type="hidden" name="unsubscribe" value="<?php echo $course['code']; ?>" />
+                                    	<input type="image" name="unsub" style="border-color:#fff" src="<?php echo api_get_path(WEB_IMG_PATH); ?>icons/22/unsubscribe_course.png" title="<?php echo get_lang('_unsubscribe') ?>"  alt="<?php echo get_lang('_unsubscribe') ?>" />
+                                    	</form>
+                                    	</div>
 	                              <?php } else {
-	                                            echo get_lang('UnsubscribeNotAllowed');
+	                                    	echo get_lang('UnsubscribeNotAllowed');
 	                                    }
 	                            } else {
-	                                    echo get_lang('CourseAdminUnsubscribeNotAllowed');
+	                            	echo get_lang('CourseAdminUnsubscribeNotAllowed');
 	                            }
 	                            ?>
-	                            </td>
-	                            </tr><tr><td>
-	                            <?php if ($key < $number_of_courses - 1) { ?>
-	                                    <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-	                                    <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
-	                                    </a>
-	                            <?php } ?>
-	                            </td></tr></table>
-	                            </td>
-	                            </tr>
+	                            
+	                            
+	                   
+								
+								
+								
 	                      <?php $key++;
 	                    }
 	                }