diff --git a/sass/custom/_paulus.scss b/sass/custom/_paulus.scss
index 04aff728974..623bb8db3de 100644
--- a/sass/custom/_paulus.scss
+++ b/sass/custom/_paulus.scss
@@ -372,6 +372,10 @@ p.note {
 @media only screen and (min-width: $desk-start) {
   #components-page {
     .filter-button-group {
+      .featured {
+        margin: 12px 0;
+      }
+
       .btn {
         display: block;
         background: 0;
diff --git a/source/components/index.html b/source/components/index.html
index d9ee273e703..1dd28d43c85 100644
--- a/source/components/index.html
+++ b/source/components/index.html
@@ -13,19 +13,22 @@ body_id: components-page
 regenerate: true
 ---
 
+{% assign count = site.components | size %}
+{% assign nocat = site.components | where: 'ha_category', null | size %}
+{% assign tot = count | minus: nocat %}
+{% assign components = site.components | sort: 'title' %}
+{% assign categories = components | sort: 'ha_category' | map: 'ha_category' | uniq %}
+
 <p class='note'>
 Support for these components is provided by the Home Assistant community.
 </p>
 
-{% assign components = site.components | sort: 'title' %}
-{% assign categories = components | sort: 'ha_category' | map: 'ha_category' | uniq %}
-
 <div class="grid">
   <div class="grid__item one-sixth lap-one-whole palm-one-whole">
 
     <div class="filter-button-group">
-      <a href='#all' class="btn">All</a>
-      <a href='#featured' class="btn">Featured</a>
+      <a href='#all' class="btn">All ({{tot}})</a>
+      <a href='#featured' class="btn featured">Featured</a>
 
       {% for category in categories %}
         {% if category and category != 'Other' %}