Simplifying category page markup

app/assets/javascripts/discourse/templates/components/categories-only.hbs

@@ -13,14 +13,12 @@
       {{#each categories as |c|}}
         <tr data-category-id={{c.id}} class="{{if c.description_excerpt 'has-description' 'no-description'}} {{if c.uploaded_logo.url 'has-logo' 'no-logo'}}">
           <td class="category" style={{border-color c.color}}>
-            <div>
               {{category-title-link category=c}}
               <div class="category-description">
                 {{{dir-span c.description_excerpt}}}
+            
               </div>
-              <div class="clearfix"></div>
+                   {{#if c.subcategories}}
-            </div>
-            {{#if c.subcategories}}
               <div class='subcategories'>
                 {{#each c.subcategories as |s|}}
                   <span class='subcategory'>
@@ -31,6 +29,7 @@
                 {{/each}}
               </div>
             {{/if}}
+           
           </td>
           <td class="topics">
             <div title={{c.statTitle}}>{{{c.stat}}}</div>

app/assets/stylesheets/desktop/category-list.scss

@@ -50,6 +50,7 @@
   }
 
   .subcategories {
+    margin-top: 0.25em;
     .badge-notification.new-posts {
       padding: 0;
       margin: 0 10px 0 0;

app/assets/stylesheets/desktop/topic-list.scss

@@ -223,8 +223,7 @@ button.dismiss-read {
 .category-logo {
   max-height: 150px;
   float: left;
-  margin-bottom: 15px;
+  margin: 0.25em 1em 0.5em 0;
-  margin-right: 15px;
 }
 
 /* Tablet (portrait) ----------- */