diff --git a/themes/mongodb/layout.html b/themes/mongodb/layout.html
index 4d67ce8c591..bb0b30990e9 100644
--- a/themes/mongodb/layout.html
+++ b/themes/mongodb/layout.html
@@ -23,8 +23,12 @@
   {%- set titlesuffix = "" %}
 {%- endif %}
 
-{%- macro githublink() %}
-<a href="https://github.com/mongodb/docs/blob/{{theme_branch}}/source/{{pagename}}.txt" target="_blank">Edit this Page</a>
+{%- macro githublink() -%}
+<a href="https://github.com/mongodb/docs/blob/{{theme_branch}}/source/{{pagename}}.txt" target="_blank" title="Edit {{pagename}}.txt on github">Edit this Page</a>
+{%- endmacro -%}
+
+{%- macro jiralink() -%}
+https://jira.mongodb.org/secure/CreateIssueDetails!init.jspa?pid=10380&issuetype=4&priority=4&summary=Comment+on%3a+%22{{ pagename | escape }}%2Etxt%22
 {%- endmacro -%}
 
 {%- macro relbar(show_logo=True) %}
@@ -37,7 +41,7 @@
              {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
           {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
         {%- endfor #}
-        <li class="right">| {{ githublink() }} </li>
+        <li class="right">| {{- githublink() -}} </li>
         <li class="right">| <a href="http://github.com/mongodb/docs" title="Fork the documentation on GitHub to contribute.">GitHub</a></li>
         <li class="right"><a href="http://jira.mongodb.org/browse/DOCS" title="Open a case in Jira to report a problem with the documentation.">Jira</a></li>
         {%- if show_logo  %}
@@ -225,14 +229,20 @@
                 </ul>
         </div>
 </div>
-<div class="search-db"><gcse:searchbox></gcse:searchbox></div>
 <div id="header-db" class="spread">
 	<div class="split">
 		<div id="logo">
 			<div><a href="http://docs.mongodb.org/"><img src="{{ pathto('_static', 1) }}/logo-mongodb.png" width="190" height="55" alt="mongoDB" /></a></div>
 		</div>
 	</div>
-{%- block relbar1 %}{{ relbar(false) }}{% endblock %}
+<div class="search-db"><gcse:searchbox></gcse:searchbox></div>
+<div id="etp">
+<ul>
+<li>{{ githublink() }}</li>
+<li><a href="http://github.com/mongodb/docs" target="_blank" title="Fork the documentation on GitHub and contribute.">GitHub</a></li>
+<li><a href="{{ jiralink() }}" target="_blank" title="Report a problem with {{pagename|e}}.txt on Jira">Report a problem</a></li>
+</ul>
+</div>
 </div>
 {%- endblock %}
 {%- block content %}
diff --git a/themes/mongodb/static/mongodb-docs.css_t b/themes/mongodb/static/mongodb-docs.css_t
index 76beafa06a5..a3612ed3ee8 100644
--- a/themes/mongodb/static/mongodb-docs.css_t
+++ b/themes/mongodb/static/mongodb-docs.css_t
@@ -483,11 +483,10 @@ input[type="text"]:disabled {
 
 div.search-db {
     position: absolute;
-    top: 54px;
+    top: 46px;
     right: 8px;
     width: 246px;
     height: 31px;
-#    background-image: url(http://media.mongodb.org/back-search-input.png);
     background-repeat: no-repeat;
     *z-index: 1;
 }
@@ -624,3 +623,9 @@ div#header-db  {background-repeat: repeat-x;}
 div#header-db div.split {float:left;}
 div.gsc-control-cse-en, div.gsc-control-cse {padding:0!important;}
 .cse .gsc-search-button input.gsc-search-button-v2,input.gsc-search-button-v2 {height:13px;margin-top:0px!important;min-width:13px;padding:6px 27px;width:13px;}
+div#etp {position:absolute;background:inherit;margin:0;top:87px;;padding:0;float:right;font-size:13px;right:10px;color:#C48C55}
+div#etp ul {padding:0;margin:0;}
+div#etp ul li {display:inline;list-style-type:none;font-size:13px;color:#C48C55;padding: 8px 1em 0 0;}
+div#etp ul li a {color:#AA814D}
+div#etp ul li:before {content:"|";padding-right:1em;color:#c48c55}
+div#etp ul li:first-child:before {content:"";}