diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d7381f51..1584da14 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -157,7 +157,7 @@
             android:label="@string/pinned"/>
 
         <activity
-            android:name=".ui.modules.gists.PublicGistsActivity"
+            android:name=".ui.modules.gists.GistsListActivity"
             android:label="@string/public_gists"/>
 
 
diff --git a/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java b/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java
index 213ea95d..e36f1ad0 100644
--- a/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java
+++ b/app/src/main/java/com/fastaccess/provider/scheme/StackBuilderSchemeParser.java
@@ -151,6 +151,7 @@ public class StackBuilderSchemeParser {
         }
         if (issueNumber < 1) return null;
         return TaskStackBuilder.create(context)
+                .addParentStack(MainView.class)
                 .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.PULL_REQUEST))
                 .addNextIntent(PullRequestPagerView.createIntent(context, repo, owner, issueNumber));
     }
@@ -182,6 +183,7 @@ public class StackBuilderSchemeParser {
         }
         if (issueNumber < 1) return null;
         return TaskStackBuilder.create(context)
+                .addParentStack(MainView.class)
                 .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.ISSUES))
                 .addNextIntent(IssuePagerView.createIntent(context, repo, owner, issueNumber));
     }
@@ -192,10 +194,9 @@ public class StackBuilderSchemeParser {
         String owner = segments.get(0);
         String repoName = segments.get(1);
         return TaskStackBuilder.create(context)
-                .addParentStack(MainView.class)
+                .addNextIntentWithParentStack(new Intent(context, MainView.class))
                 .addNextIntent(RepoPagerView.createIntent(context, repoName, owner));
     }
-
     /**
      * [[k0shk0sh, FastHub, issues], k0shk0sh/fastHub/(issues,pulls,commits, etc)]
      */
@@ -207,10 +208,11 @@ public class StackBuilderSchemeParser {
             if (segments.size() == 1) {
                 return getUser(context, uri);
             } else if (segments.size() > 1) {
+                if (segments.contains("wiki")) return null;
                 String owner = segments.get(0);
                 String repoName = segments.get(1);
                 return TaskStackBuilder.create(context)
-                        .addParentStack(MainView.class)
+                        .addNextIntentWithParentStack(new Intent(context, MainView.class))
                         .addNextIntent(RepoPagerView.createIntent(context, repoName, owner));
             }
         }
@@ -225,6 +227,7 @@ public class StackBuilderSchemeParser {
             String repoId = segments.get(2);
             String sha = segments.get(4);
             return TaskStackBuilder.create(context)
+                    .addParentStack(MainView.class)
                     .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repoId, login))
                     .addNextIntent(CommitPagerView.createIntent(context, repoId, login, sha));
         }
@@ -238,6 +241,7 @@ public class StackBuilderSchemeParser {
         String repoId = segments.get(1);
         String sha = segments.get(3);
         return TaskStackBuilder.create(context)
+                .addParentStack(MainView.class)
                 .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repoId, login))
                 .addNextIntent(CommitPagerView.createIntent(context, repoId, login, sha));
     }
@@ -246,7 +250,7 @@ public class StackBuilderSchemeParser {
         List<String> segments = uri.getPathSegments();
         if (segments != null && !segments.isEmpty() && segments.size() == 1) {
             return TaskStackBuilder.create(context)
-                    .addParentStack(MainView.class)
+                    .addNextIntentWithParentStack(new Intent(context, MainView.class))
                     .addNextIntent(UserPagerView.createIntent(context, segments.get(0)));
         }
         return null;
@@ -271,13 +275,13 @@ public class StackBuilderSchemeParser {
                 }
             }
             if (fullUrl != null) return TaskStackBuilder.create(context)
-                    .addParentStack(MainView.class)
+                    .addNextIntentWithParentStack(new Intent(context, MainView.class))
                     .addNextIntent(CodeViewerView.createIntent(context, fullUrl));
         } else {
             String authority = uri.getAuthority();
             if (TextUtils.equals(authority, RAW_AUTHORITY)) {
                 return TaskStackBuilder.create(context)
-                        .addParentStack(MainView.class)
+                        .addNextIntentWithParentStack(new Intent(context, MainView.class))
                         .addNextIntent(CodeViewerView.createIntent(context, uri.toString()));
             }
         }
@@ -296,6 +300,7 @@ public class StackBuilderSchemeParser {
             String owner = segments.get(0);
             String repo = segments.get(1);
             return TaskStackBuilder.create(context)
+                    .addParentStack(MainView.class)
                     .addNextIntentWithParentStack(RepoPagerView.createIntent(context, repo, owner, RepoPagerMvp.ISSUES))
                     .addNextIntent(CreateIssueView.getIntent(context, owner, repo));
         }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/PublicGistsActivity.java b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsListActivity.java
similarity index 94%
rename from app/src/main/java/com/fastaccess/ui/modules/gists/PublicGistsActivity.java
rename to app/src/main/java/com/fastaccess/ui/modules/gists/GistsListActivity.java
index d0ef26b8..f1410709 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/gists/PublicGistsActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsListActivity.java
@@ -25,10 +25,10 @@ import icepick.State;
  * Created by Kosh on 25 Mar 2017, 11:28 PM
  */
 
-public class PublicGistsActivity extends BaseActivity {
+public class GistsListActivity extends BaseActivity {
 
     public static void startActivity(@NonNull Context context, boolean myGists) {
-        Intent intent = new Intent(context, PublicGistsActivity.class);
+        Intent intent = new Intent(context, GistsListActivity.class);
         intent.putExtras(Bundler.start().put(BundleConstant.EXTRA, myGists).end());
         context.startActivity(intent);
     }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
index 2a41fbf0..c5dadfe1 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
@@ -23,7 +23,7 @@ import com.fastaccess.helper.TypeFaceHelper;
 import com.fastaccess.helper.ViewHelper;
 import com.fastaccess.ui.base.BaseActivity;
 import com.fastaccess.ui.modules.feeds.FeedsView;
-import com.fastaccess.ui.modules.gists.PublicGistsActivity;
+import com.fastaccess.ui.modules.gists.GistsListActivity;
 import com.fastaccess.ui.modules.main.donation.DonationView;
 import com.fastaccess.ui.modules.notification.NotificationActivityView;
 import com.fastaccess.ui.modules.pinned.PinnedReposActivity;
@@ -157,7 +157,7 @@ public class MainView extends BaseActivity<MainMvp.View, MainPresenter> implemen
     }
 
     @Override public void onOpenGists(boolean myGists) {
-        PublicGistsActivity.startActivity(this, myGists);
+        GistsListActivity.startActivity(this, myGists);
     }
 
     @Override public void onOpenPinnedRepos() {
diff --git a/pago/build.gradle b/pago/build.gradle
index b914887e..8898bd9e 100755
--- a/pago/build.gradle
+++ b/pago/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'io.reactivex:rxjava:1.2.3'
     compile 'com.google.code.gson:gson:2.8.0'
 }
\ No newline at end of file