diff --git a/app/styles/docs/components.sass b/app/styles/docs/components.sass
index fc1dec4f5..73979ded2 100644
--- a/app/styles/docs/components.sass
+++ b/app/styles/docs/components.sass
@@ -3,16 +3,23 @@
 
   .row
 
+
+
     .index-column, .documentation-column
-      overflow-y: scroll
       overflow-x: hidden
       min-height: 600px
 
       > ul
         padding: 0px 20px 20px 20px
 
+      .doc-name
+        color: rgb(139, 69, 19)
+
   
     .documentation-column
   
       .specialList
         list-style-type: none
+
+      .doc-description
+        list-style-type: none
diff --git a/app/templates/docs/components.jade b/app/templates/docs/components.jade
index 0e546da7e..ac92772f6 100644
--- a/app/templates/docs/components.jade
+++ b/app/templates/docs/components.jade
@@ -6,18 +6,25 @@ block content
     .col-xs-3.index-column.nano
       ul.nav.nav-list.list-group.nano-content
         for component in components
-          li= component.get('name')
-          ul
-            each doc in component.attributes.propertyDocumentation
-              a(href="##{component.get('name')}#{doc.name}")
-                li
-                  | #{doc.name}
+            a.doc-name(href="##{component.get('name')}")
+              li= component.get('name')
+              ul
+                each doc in component.attributes.propertyDocumentation
+                  a(href="##{component.get('name')}#{doc.name}")
+                    li
+                      | #{doc.name}
     .col-xs-9.documentation-column.nano
       ul.nano-content
         for component in components
-          each doc in component.attributes.propertyDocumentation
-            li(id="#{component.get('name')}#{doc.name}")
-              | #{doc.name}
-              ul.specialList
-                li=doc.description
-  
\ No newline at end of file
+          li(id="#{component.get('name')}")
+            | #{component.get('name')}
+            ul
+              li.doc-description
+                | #{component.get('description')}
+              ul
+              each doc in component.attributes.propertyDocumentation
+                li(id="#{component.get('name')}#{doc.name}")
+                  | #{doc.name}
+                  ul.specialList
+                    li!=marked(doc.description)
+      
\ No newline at end of file
diff --git a/app/views/docs/components_view.coffee b/app/views/docs/components_view.coffee
index 14f942e44..0d4f9d5e2 100644
--- a/app/views/docs/components_view.coffee
+++ b/app/views/docs/components_view.coffee
@@ -24,4 +24,5 @@ module.exports = class UnnamedView extends RootView
   getRenderData: ->
     c = super()
     c.components = @componentDocs.models
+    c.marked = marked
     c