diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java
index 1e80fe4..1f524f8 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java
@@ -37,6 +37,7 @@ import com.liskovsoft.leankeyboard.keyboard.android.leanback.ime.voice.Recognize
 import com.liskovsoft.leankeyboard.keyboard.android.leanback.ime.voice.SpeechLevelSource;
 import com.liskovsoft.leankeyboard.keyboard.leanback.ime.LeanbackImeService;
 import com.liskovsoft.leankeyboard.settings.kblayout.KbLayoutActivity;
+import com.liskovsoft.leankeyboard.settings.settings.KbSettingsActivity;
 import com.liskovsoft.leankeyboard.utils.LeanKeyPreferences;
 import com.liskovsoft.leankeyboard.addons.KeyboardManager;
 import com.liskovsoft.leankeykeyboard.R;
@@ -1408,8 +1409,7 @@ public class LeanbackKeyboardContainer {
     }
 
     private void showKbLayoutSettings() {
-        Intent intent = new Intent(mContext, KbLayoutActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Intent intent = new Intent(mContext, KbSettingsActivity.class);
         mContext.startActivity(intent);
     }
 }
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/about/AboutFragment.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/about/AboutFragment.java
index af9479d..8aafbcf 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/about/AboutFragment.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/settings/about/AboutFragment.java
@@ -30,8 +30,14 @@ public class AboutFragment extends GuidedStepSupportFragment {
 
     @Override
     public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
+        appendInfoAction(AppInfoHelpers.getApplicationName(getActivity()), actions);
+        appendInfoAction("Version " + AppInfoHelpers.getAppVersionName(getActivity()), actions);
+    }
+
+    private void appendInfoAction(String textLine, List<GuidedAction> actions) {
         GuidedAction action = new GuidedAction.Builder(getActivity())
-                .title(AppInfoHelpers.getAppVersionName(getActivity())).build();
+                .title(textLine)
+                .build();
         actions.add(action);
     }
 }
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/AppInfoHelpers.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/AppInfoHelpers.java
index 7036c77..c746dc0 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/AppInfoHelpers.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/AppInfoHelpers.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -142,4 +143,14 @@ public class AppInfoHelpers {
 
         return false;
     }
+
+    public static String getApplicationName(Context context) {
+        if (context == null) {
+            return null;
+        }
+
+        ApplicationInfo applicationInfo = context.getApplicationInfo();
+        int stringId = applicationInfo.labelRes;
+        return stringId == 0 ? applicationInfo.nonLocalizedLabel.toString() : context.getString(stringId);
+    }
 }