diff --git a/docs/conf.py b/docs/conf.py
index d1c72a9e3a69a..f526fc8fc0915 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@
 
 # General information about the project.
 project = "Apache Superset"
-copyright = 'Apache Software Foundation'
+copyright = 'Copyright © 2018 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.'
 author = u'Maxime Beauchemin'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -132,7 +132,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = "images/s.png"
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -177,10 +177,10 @@
 html_show_sourcelink = False
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+html_show_sphinx = False
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-html_show_copyright = False
+html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
diff --git a/docs/index.rst b/docs/index.rst
index 8aa2c4938604a..08e1a64bac104 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,12 @@
-.. image:: images/s.png
+|apache_img| |superset_img|
+
+.. |apache_img| image:: images/apache_feather.png
+   :width: 7%
+   :target: http://www.apache.org/
+   :alt: The Apache Software Foundation
+
+.. |superset_img| image:: images/s.png
+   :width: 25%
 
 Apache Superset (incubating)
 ''''''''''''''''''''''''''''
@@ -9,9 +17,6 @@ intelligence web application
 
 ----------------
 
-.. warning:: This project was originally named Panoramix, was renamed to
-    Caravel in March 2016, and is currently named Superset as of November 2016
-
 .. important::
 
     **Disclaimer**: Apache Superset is an effort undergoing incubation at The
@@ -24,8 +29,13 @@ intelligence web application
     the code, it does indicate that the project has yet to be fully
     endorsed by the ASF.
 
-Resources
-=========
+.. note:: Apache Superset, Superset, Apache, the Apache feather logo, and
+    the Apache Superset project logo are either registered trademarks or
+    trademarks of The Apache Software Foundation in the United States
+    and other countries.
+
+Superset Resources
+==================
 - `Superset's Github <https://github.com/apache/incubator-superset>`_, note
   that `we use Github for issue tracking <https://github.com/apache/incubator-superset/issues>`_
 - Superset's
@@ -37,6 +47,14 @@ Resources
   To subscribe, send an email to ``dev-subscribe@superset.apache.org``
 - `Join our Slack <https://join.slack.com/t/apache-superset/shared_invite/enQtNDMxMDY5NjM4MDU0LTc2Y2QwYjE4NGYwNzQyZWUwYTExZTdiZDMzMWQwZjc2YmJmM2QyMDkwMGVjZTA4N2I2MzUxZTk2YmE5MWRhZWE>`_
 
+Apache Software Foundation Resources
+====================================
+- `The Apache Software Foundation Website <http://www.apache.org>`_
+- `Current Events <http://www.apache.org/events/current-event>`_
+- `License <https://www.apache.org/licenses/>`_
+- `Thanks <https://www.apache.org/foundation/thanks.html>`_ to the ASF's sponsors
+- `Sponsor Apache! <http://www.apache.org/foundation/sponsorship.html>`_
+
 Overview
 ========
 
diff --git a/superset/assets/images/apache_feather.png b/superset/assets/images/apache_feather.png
new file mode 100644
index 0000000000000..744b8d7b82a1b
Binary files /dev/null and b/superset/assets/images/apache_feather.png differ
diff --git a/superset/jinja_context.py b/superset/jinja_context.py
index 27104ccb04119..6d4b4c6fc1db1 100644
--- a/superset/jinja_context.py
+++ b/superset/jinja_context.py
@@ -72,7 +72,7 @@ def filter_values(column, default=None):
     This searches for "filters" and "extra_filters" in form_data for a match
 
     Usage example:
-        * SELECT action, count(*) as times
+        SELECT action, count(*) as times
         FROM logs
         WHERE action in ( {{ "'" + "','".join(filter_values('action_type')) + "'" )
         GROUP BY 1
@@ -82,7 +82,7 @@ def filter_values(column, default=None):
     :param default: default value to return if there's no matching columns
     :type default: str
     :return: returns a list of filter values
-    :rtype: list
+    :type: list
     """
     form_data = json.loads(request.form.get('form_data', '{}'))
     return_val = []