diff --git a/lib/adiwg/mdtranslator/version.rb b/lib/adiwg/mdtranslator/version.rb
index e50be1d2e..133b4249e 100644
--- a/lib/adiwg/mdtranslator/version.rb
+++ b/lib/adiwg/mdtranslator/version.rb
@@ -13,7 +13,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.0.0rc6"
+      VERSION = "2.0.0rc7"
    end
 end
 
diff --git a/lib/adiwg/mdtranslator/writers/html/sections/html_bodyScript.js b/lib/adiwg/mdtranslator/writers/html/sections/html_bodyScript.js
index 4882c4aa3..948862579 100644
--- a/lib/adiwg/mdtranslator/writers/html/sections/html_bodyScript.js
+++ b/lib/adiwg/mdtranslator/writers/html/sections/html_bodyScript.js
@@ -30,6 +30,12 @@ if (!Array.prototype.forEach) {
 function openDetail(evt) {
    var href = evt.target.getAttribute("href");
    href = href.slice(1);
+
+   if(window.frameElement){
+     evt.preventDefault();
+     var el = document.getElementById(href);
+     window.scrollTo(0, el.offsetTop);
+   }
    var parentNode = document.getElementById(href).parentNode;
    parentNode.open = true;
 }
@@ -58,7 +64,14 @@ function closeAllDetails() {
 var navBtnList = document.querySelectorAll('a.navBtn');
 var navBtnArray = Array.prototype.slice.call(navBtnList);
 navBtnArray.forEach(function(btn, btnIdx, btnArr) {
-   btn.addEventListener("click", openDetail, false);
+   var href = btn.getAttribute("href").slice(1);
+   var target = document.getElementById(href);
+   //hide button if target is not present
+   if(target) {
+     btn.addEventListener("click", openDetail, false);
+   } else {
+     btn.style.display = 'none';
+   }
 });
 
 // add event listener to openAllButton