diff --git a/sass/custom/_component_page.scss b/sass/custom/_component_page.scss
index 27962bb15a4..5cc5f79c75a 100644
--- a/sass/custom/_component_page.scss
+++ b/sass/custom/_component_page.scss
@@ -50,12 +50,12 @@
         margin: 12px 0;
       }
 
-      .added_in_current_version {
-        margin-top: 12px;
+      .version_select {
+        margin: 12px 0 12px 0;
       }
 
-      .version_select {
-        margin-bottom: 12px;
+      .version_select > select {
+        width: 100%;
       }
 
       .btn {
diff --git a/source/components/index.html b/source/components/index.html
index 3b458b40632..61685b291c1 100644
--- a/source/components/index.html
+++ b/source/components/index.html
@@ -28,9 +28,6 @@ regenerate: false
 {%- assign components = site.components | sort: 'title' -%}
 {%- assign components_by_version = site.components | group_components_by_release -%}
 {%- assign categories = components | map: 'ha_category' | join: ',' | join: ',' | split: ',' | uniq | sort -%}
-{%- assign current_version = components_by_version[0]["versions"][0] -%}
-{%- assign one_version_ago = components_by_version | version_behind: 1 -%}
-{%- assign two_versions_ago = components_by_version | version_behind: 2 -%}
 
 <p class='note'>
 Support for these components is provided by the Home Assistant community.
@@ -41,10 +38,7 @@ Support for these components is provided by the Home Assistant community.
     <div class="filter-button-group">
       <a href='#all' class="btn">All ({{tot}})</a>
       <a href='#featured' class="btn featured">Featured</a>
-      <a href='#version/{{ current_version.label }}' class="btn added_in_current_version">Added in {{ current_version.label }} ({{ current_version.new_components_count }})</a>
-      <a href='#version/{{ one_version_ago.label }}' class="btn added_one_version_ago">Added in {{ one_version_ago.label }} ({{ one_version_ago.new_components_count }})</a>
-      <a href='#version/{{ two_versions_ago.label }}' class="btn added_two_versions_ago">Added in {{ two_versions_ago.label }} ({{ two_versions_ago.new_components_count }})</a>
-      Added in <select name="versions" class="version_select">
+      <div class="version_select">Added in: <select name="versions">
         {%- for group in components_by_version -%}
           <optgroup label="{{ group.label }} ({{group.new_components_count}})">
             {%- for version in group.versions -%}
@@ -52,7 +46,7 @@ Support for these components is provided by the Home Assistant community.
             {%- endfor -%}
           </optgroup>
         {%- endfor -%}
-      </select>
+      </select></div>
 {%- for category in categories -%}
   {%- assign components_count = components | where: 'ha_category', category | size -%}
   {%- if category and category != 'Other' and components_count != 0 -%}