diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
index 1f7e37aa..4a594da9 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiActivity.kt
@@ -53,6 +53,7 @@ class WikiActivity : BaseActivity<WikiMvp.View, WikiPresenter>(), WikiMvp.View {
     }
 
     private fun loadMenu() {
+        navMenu.menu.clear()
         wiki.sidebar.onEach {
             navMenu.menu.add(R.id.languageGroup, it.title?.hashCode()!!, Menu.NONE, it.title)
                     .setCheckable(true)
@@ -80,14 +81,10 @@ class WikiActivity : BaseActivity<WikiMvp.View, WikiPresenter>(), WikiMvp.View {
     }
 
     private fun onSidebarClicked(item: MenuItem) {
+        this.selectedTitle = item.title.toString()
         closeDrawerLayout()
         wiki.sidebar.first { it.title?.toLowerCase() == item.title.toString().toLowerCase() }
-                .let {
-                    if (it.title != null) {
-                        this.selectedTitle = it.title
-                        presenter.onSidebarClicked(it)
-                    }
-                }
+                .let { presenter.onSidebarClicked(it) }
     }
 
     private fun closeDrawerLayout() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt
index a8a70749..6ebac76d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/wiki/WikiPresenter.kt
@@ -43,7 +43,14 @@ class WikiPresenter : BasePresenter<WikiMvp.View>(), WikiMvp.Presenter {
             val document: Document = Jsoup.parse(body, "")
             val wikiWrapper = document.select("#wiki-wrapper")
             if (wikiWrapper.isNotEmpty()) {
-//                val header = wikiWrapper.select(".gh-header-title").html()
+                val cloneUrl = wikiWrapper.select(".clone-url")
+                val bottomRightBar = wikiWrapper.select(".wiki-custom-sidebar")
+                if (cloneUrl.isNotEmpty()) {
+                    cloneUrl.remove()
+                }
+                if (bottomRightBar.isNotEmpty()) {
+                    bottomRightBar.remove()
+                }
                 val wikiContent = wikiWrapper.select(".wiki-content")
                 val content = wikiContent.select(".markdown-body").html()
                 val rightBarList = wikiContent.select(".wiki-pages").select("li")