diff --git a/doc/source/conf.py b/doc/source/conf.py
index a087cc59..cc94f093 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -57,8 +57,8 @@ release = '1.0'
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openinfra/refstack'
-bug_project = '878'
-bug_tag = ''
+openstackdocs_bug_project = '878'
+openstackdocs_bug_tag = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/refstack-ui/app/components/about/aboutController.js b/refstack-ui/app/components/about/aboutController.js
index 2c22edba..2c81b6dd 100644
--- a/refstack-ui/app/components/about/aboutController.js
+++ b/refstack-ui/app/components/about/aboutController.js
@@ -35,7 +35,7 @@
         ctrl.options = {
             'about' : {
                 'title': 'About RefStack',
-                'template': 'components/about/templates/README.html',
+                'template': 'components/about/templates/overview.html',
                 'order': 1
             },
             'uploading-your-results': {
@@ -50,10 +50,15 @@
                             'test_result_management.html',
                 'order': 3
             },
-            'vendors-and-products': {
-                'title': 'Vendors and Products',
-                'template': 'components/about/templates/vendor_product.html',
+            'vendors': {
+                'title': 'Vendors',
+                'template': 'components/about/templates/VendorEntity.html',
                 'order': 4
+            },
+            'products': {
+                'title': 'Products',
+                'template': 'components/about/templates/ProductEntity.html',
+                'order': 5
             }
         };