diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java
index d193b838..cfc97431 100644
--- a/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java
+++ b/app/src/main/java/io/xpipe/app/browser/BrowserWelcomeComp.java
@@ -146,7 +146,10 @@ public class BrowserWelcomeComp extends SimpleComp {
                         view.createRegion(),
                         () -> {
                             ThreadHelper.runAsync(() -> {
-                                model.restoreStateAsync(e, disable);
+                                var storageEntry = DataStorage.get().getStoreEntryIfPresent(e.getUuid());
+                                if (storageEntry.isPresent()) {
+                                    model.openFileSystemAsync(storageEntry.get().ref(), null, disable);
+                                }
                             });
                         })
                 .minWidth(250)
diff --git a/app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java
index 8cfb6579..8aa86af5 100644
--- a/app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java
+++ b/app/src/main/java/io/xpipe/app/core/check/AppAvCheck.java
@@ -65,7 +65,7 @@ public class AppAvCheck {
                 alert.getDialogPane().setPadding(new Insets(15));
             });
 
-            alert.getButtonTypes().add(new ButtonType(AppI18n.get("gotIt"), ButtonBar.ButtonData.OK_DONE));
+            alert.getButtonTypes().add(new ButtonType(AppI18n.get("ok"), ButtonBar.ButtonData.OK_DONE));
         });
         a.filter(b -> b.getButtonData().isDefaultButton())
                 .ifPresentOrElse(buttonType -> {}, () -> OperationMode.halt(1));
diff --git a/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java b/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java
index ee9cc17f..6fc95ef5 100644
--- a/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java
+++ b/app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java
@@ -49,7 +49,7 @@ public class UpdateChangelogAlert {
                     var markdown = new MarkdownComp(update.getRawDescription(), s -> " " + s).createRegion();
                     alert.getDialogPane().setContent(markdown);
 
-                    alert.getButtonTypes().add(new ButtonType(AppI18n.get("gotIt"), ButtonBar.ButtonData.OK_DONE));
+                    alert.getButtonTypes().add(new ButtonType(AppI18n.get("ok"), ButtonBar.ButtonData.OK_DONE));
                     ((Stage) alert.getDialogPane().getScene().getWindow()).setAlwaysOnTop(true);
                 },
                 r -> r.filter(b -> b.getButtonData().isDefaultButton()).ifPresent(t -> {}));
diff --git a/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css
index a88a4f66..d2ff2c73 100644
--- a/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css
+++ b/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css
@@ -94,7 +94,7 @@
 
 /* Section */
 
-.store-entry-section-comp .separator {
+.store-entry-section-comp > .separator {
     -fx-padding: 0 12px 0 35px;
     -fx-border-insets: 0px;
 }
@@ -103,7 +103,7 @@
     -fx-padding: 5px 0 5px 25px;
 }
 
-.store-entry-section-comp .separator .line {
+.store-entry-section-comp > .separator .line {
     -fx-padding: 0;
     -fx-border-insets: 0px;
     -fx-background-color: -color-border-subtle;
@@ -111,7 +111,7 @@
 }
 
 .root:pretty .top > .store-entry-section-comp {
-    -fx-effect: dropshadow(three-pass-box, -color-shadow-default, 2px, 0.5, 0, 1);
+    -fx-effect: dropshadow(three-pass-box, -color-shadow-default, 2, 0.5, 0, 1);
 }
 
 .store-entry-section-comp:root {
diff --git a/core/src/main/java/io/xpipe/core/store/Session.java b/core/src/main/java/io/xpipe/core/store/Session.java
new file mode 100644
index 00000000..5607fade
--- /dev/null
+++ b/core/src/main/java/io/xpipe/core/store/Session.java
@@ -0,0 +1,10 @@
+package io.xpipe.core.store;
+
+public abstract class Session {
+
+    public abstract boolean isRunning();
+
+    public abstract void start() throws Exception;
+
+    public abstract void stop() throws Exception;
+}
diff --git a/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java b/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
index ec1f3e55..194d51d9 100644
--- a/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
+++ b/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
@@ -1,17 +1,8 @@
 package io.xpipe.core.store;
 
-public interface SingletonSessionStore<T extends SingletonSessionStore.Session>
+public interface SingletonSessionStore<T extends Session>
         extends ExpandedLifecycleStore, InternalCacheDataStore {
 
-    abstract class Session {
-
-        public abstract boolean isRunning();
-
-        public abstract void start() throws Exception;
-
-        public abstract void stop() throws Exception;
-    }
-
     @Override
     default void finalizeValidate() throws Exception {
         stopSessionIfNeeded();
diff --git a/lang/app/strings/translations_da.properties b/lang/app/strings/translations_da.properties
index 9f0bd9d8..58358444 100644
--- a/lang/app/strings/translations_da.properties
+++ b/lang/app/strings/translations_da.properties
@@ -233,7 +233,6 @@ whatsNew=Hvad er nyt i version $VERSION$ ($DATE$)
 antivirusNoticeTitle=En note om antivirusprogrammer
 updateChangelogAlertTitle=Changelog
 greetingsAlertTitle=Velkommen til XPipe
-gotIt=Fik det
 eula=Slutbrugerlicensaftale
 news=Nyheder
 introduction=Introduktion
diff --git a/lang/app/strings/translations_de.properties b/lang/app/strings/translations_de.properties
index 94b9fd28..d47a375c 100644
--- a/lang/app/strings/translations_de.properties
+++ b/lang/app/strings/translations_de.properties
@@ -230,8 +230,6 @@ whatsNew=Was ist neu in der Version $VERSION$ ($DATE$)
 antivirusNoticeTitle=Ein Hinweis auf Antivirenprogramme
 updateChangelogAlertTitle=Changelog
 greetingsAlertTitle=Willkommen bei XPipe
-#custom
-gotIt=Ok
 eula=Endbenutzer-Lizenzvertrag
 news=Nachrichten
 introduction=Einführung
diff --git a/lang/app/strings/translations_en.properties b/lang/app/strings/translations_en.properties
index 525c5b17..033ca36d 100644
--- a/lang/app/strings/translations_en.properties
+++ b/lang/app/strings/translations_en.properties
@@ -229,8 +229,6 @@ whatsNew=What's new in version $VERSION$ ($DATE$)
 antivirusNoticeTitle=A note on Antivirus programs
 updateChangelogAlertTitle=Changelog
 greetingsAlertTitle=Welcome to XPipe
-#context: understood
-gotIt=Got It
 eula=End User License Agreement
 news=News
 introduction=Introduction
diff --git a/lang/app/strings/translations_es.properties b/lang/app/strings/translations_es.properties
index 9e82261a..5d5a6e8b 100644
--- a/lang/app/strings/translations_es.properties
+++ b/lang/app/strings/translations_es.properties
@@ -221,7 +221,6 @@ whatsNew=Novedades de la versión $VERSION$ ($DATE$)
 antivirusNoticeTitle=Una nota sobre los programas antivirus
 updateChangelogAlertTitle=Registro de cambios
 greetingsAlertTitle=Bienvenido a XPipe
-gotIt=Entendido
 eula=Acuerdo de licencia de usuario final
 news=Noticias
 introduction=Introducción
diff --git a/lang/app/strings/translations_fr.properties b/lang/app/strings/translations_fr.properties
index c37f54b7..bb7f8150 100644
--- a/lang/app/strings/translations_fr.properties
+++ b/lang/app/strings/translations_fr.properties
@@ -221,7 +221,6 @@ whatsNew=Nouveautés de la version $VERSION$ ($DATE$)
 antivirusNoticeTitle=Une note sur les programmes antivirus
 updateChangelogAlertTitle=Changelog
 greetingsAlertTitle=Bienvenue à XPipe
-gotIt=Compris
 eula=Contrat de licence de l'utilisateur final
 news=Nouvelles
 introduction=Introduction
diff --git a/lang/app/strings/translations_it.properties b/lang/app/strings/translations_it.properties
index 8710c03b..e78775b4 100644
--- a/lang/app/strings/translations_it.properties
+++ b/lang/app/strings/translations_it.properties
@@ -221,7 +221,6 @@ whatsNew=Cosa c'è di nuovo nella versione $VERSION$ ($DATE$)
 antivirusNoticeTitle=Una nota sui programmi antivirus
 updateChangelogAlertTitle=Changelog
 greetingsAlertTitle=Benvenuto in XPipe
-gotIt=Capito
 eula=Contratto di licenza con l'utente finale
 news=Notizie
 introduction=Introduzione
diff --git a/lang/app/strings/translations_ja.properties b/lang/app/strings/translations_ja.properties
index 1d678d4b..5948c308 100644
--- a/lang/app/strings/translations_ja.properties
+++ b/lang/app/strings/translations_ja.properties
@@ -221,7 +221,6 @@ whatsNew=バージョン$VERSION$ ($DATE$) の新機能
 antivirusNoticeTitle=アンチウイルスプログラムについて
 updateChangelogAlertTitle=変更履歴
 greetingsAlertTitle=XPipeへようこそ
-gotIt=理解した
 eula=エンドユーザー使用許諾契約書
 news=ニュース
 introduction=はじめに
diff --git a/lang/app/strings/translations_nl.properties b/lang/app/strings/translations_nl.properties
index b6982461..36f3e941 100644
--- a/lang/app/strings/translations_nl.properties
+++ b/lang/app/strings/translations_nl.properties
@@ -221,7 +221,6 @@ whatsNew=Wat is er nieuw in versie $VERSION$ ($DATE$)
 antivirusNoticeTitle=Een opmerking over antivirusprogramma's
 updateChangelogAlertTitle=Changelog
 greetingsAlertTitle=Welkom bij XPipe
-gotIt=Gekregen
 eula=Licentieovereenkomst voor eindgebruikers
 news=Nieuws
 introduction=Inleiding
diff --git a/lang/app/strings/translations_pt.properties b/lang/app/strings/translations_pt.properties
index 43e38f71..f7df04a5 100644
--- a/lang/app/strings/translations_pt.properties
+++ b/lang/app/strings/translations_pt.properties
@@ -221,7 +221,6 @@ whatsNew=O que há de novo na versão $VERSION$ ($DATE$)
 antivirusNoticeTitle=Uma nota sobre programas antivírus
 updateChangelogAlertTitle=Changelog
 greetingsAlertTitle=Bem-vindo ao XPipe
-gotIt=Percebeste
 eula=Contrato de licença de utilizador final
 news=Novidades
 introduction=Introdução
diff --git a/lang/app/strings/translations_ru.properties b/lang/app/strings/translations_ru.properties
index 297a2e36..5d4d571c 100644
--- a/lang/app/strings/translations_ru.properties
+++ b/lang/app/strings/translations_ru.properties
@@ -221,7 +221,6 @@ whatsNew=Что нового в версии $VERSION$ ($DATE$)
 antivirusNoticeTitle=Заметка об антивирусных программах
 updateChangelogAlertTitle=Changelog
 greetingsAlertTitle=Добро пожаловать в XPipe
-gotIt=Понял
 eula=Лицензионное соглашение с конечным пользователем
 news=Новости
 introduction=Введение
diff --git a/lang/app/strings/translations_tr.properties b/lang/app/strings/translations_tr.properties
index fdb9cc7c..c9432eba 100644
--- a/lang/app/strings/translations_tr.properties
+++ b/lang/app/strings/translations_tr.properties
@@ -221,7 +221,6 @@ whatsNew=$VERSION$ sürümündeki yenilikler ($DATE$)
 antivirusNoticeTitle=Antivirüs programları hakkında bir not
 updateChangelogAlertTitle=Değişiklik Günlüğü
 greetingsAlertTitle=XPipe'a Hoş Geldiniz
-gotIt=Anladım
 eula=Son Kullanıcı Lisans Sözleşmesi
 news=Haberler
 introduction=Giriş
diff --git a/lang/app/strings/translations_zh.properties b/lang/app/strings/translations_zh.properties
index 4561fd50..15068e1f 100644
--- a/lang/app/strings/translations_zh.properties
+++ b/lang/app/strings/translations_zh.properties
@@ -221,7 +221,6 @@ whatsNew=$VERSION$ ($DATE$) 中的新功能
 antivirusNoticeTitle=关于杀毒软件的说明
 updateChangelogAlertTitle=更新日志
 greetingsAlertTitle=欢迎访问 XPipe
-gotIt=明白了
 eula=最终用户许可协议
 news=新闻
 introduction=简介