diff --git a/CHANGELOG.md b/CHANGELOG.md
index f07c3c9..49567fd 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,3 +14,8 @@ All notable changes to this project will be documented in this file.
 ## 1.0.2
 - Adding Unregistering Tag Login
 
+## 1.0.3
+- Locking to Portrait
+- Removing Session Storage (temporary)
+- Fixing Bug in finalize button logic
+
diff --git a/plugin-manifest.json b/plugin-manifest.json
index c98c52c..c1417e6 100755
--- a/plugin-manifest.json
+++ b/plugin-manifest.json
@@ -7,14 +7,14 @@
   "platform": "android",
   "author_name": "Javier Casaudoumecq",
   "author_email": "j.casaudoumecq@applicaster.com",
-  "manifest_version": "1.0.2",
+  "manifest_version": "1.0.3",
   "name": "Onboarding",
   "description": "A plugin to onboard users and allow them to set up push notifications content personalization",
   "type": "general",
   "identifier": "onboarding",
   "ui_builder_support": true,
   "dependency_name": "com.applicaster:OnBoardingScreenPlugin-Android",
-  "dependency_version": "1.0.2",
+  "dependency_version": "1.0.3",
   "whitelisted_account_ids": [
     "56e92d4b643037000b000000",
     "5a53d5ec9349a1000ecadf69"
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 66e18e1..b088343 100755
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -12,15 +12,8 @@
         android:theme="@style/Theme.Onboarding">
         <activity
             android:name="com.applicaster.onboarding.screen.presentation.onboarding.OnboardingActivity"
-            android:label="@string/title_activity_onboarding"></activity>
-        <activity android:name=".presentation.login.LoginActivity" />
-        <activity android:name=".presentation.register.RegisterActivity" />
-        <activity android:name=".presentation.forgotPassword.ForgotPasswordActivity" />
-        <activity android:name=".presentation.intro.IntroActivity" />
-        <activity
-            android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name" />
+            android:label="@string/title_activity_onboarding"
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.facebook.CustomTabActivity"
             android:exported="true">
diff --git a/src/main/java/com/applicaster/onboarding/screen/OnboardingScreenContract.java b/src/main/java/com/applicaster/onboarding/screen/OnboardingScreenContract.java
index d7d3593..521a31f 100755
--- a/src/main/java/com/applicaster/onboarding/screen/OnboardingScreenContract.java
+++ b/src/main/java/com/applicaster/onboarding/screen/OnboardingScreenContract.java
@@ -8,7 +8,7 @@
 import com.applicaster.plugin_manager.PluginSchemeI;
 import com.applicaster.plugin_manager.hook.ApplicationLoaderHookUpI;
 import com.applicaster.plugin_manager.hook.HookListener;
-import com.applicaster.session.SessionStorage;
+//import com.applicaster.session.SessionStorage;
 import com.applicaster.util.PreferenceUtil;
 
 import java.util.Arrays;
@@ -16,8 +16,6 @@
 import java.util.List;
 import java.util.Map;
 
-//import com.applicaster.session.SessionStorage;
-
 public class OnboardingScreenContract implements PluginSchemeI, ApplicationLoaderHookUpI {
 
     public static final String USER_RECOMMENDATION_KEY = "userRecommendationTags";
@@ -46,7 +44,7 @@ public void executeOnApplicationReady(final Context context, final HookListener
             navigator.goToOnboardingScreen(context, listener, Collections.<String>emptyList());
         } else {
             List<String> previousOBSelections = Arrays.asList(selections);
-            SessionStorage.INSTANCE.set(USER_RECOMMENDATION_KEY, previousOBSelections.toString(), USER_RECOMMENDATION_NAMESPACE);
+//            SessionStorage.INSTANCE.set(USER_RECOMMENDATION_KEY, previousOBSelections.toString(), USER_RECOMMENDATION_NAMESPACE);
             listener.onHookFinished();
         }
     }
@@ -65,7 +63,7 @@ public boolean handlePluginScheme(Context context, Map<String, String> data) {
             List<String> previousOBSelections = Collections.emptyList();
             if (selections != null) {
                 previousOBSelections = Arrays.asList(selections);
-                SessionStorage.INSTANCE.set(USER_RECOMMENDATION_KEY, previousOBSelections.toString(), USER_RECOMMENDATION_NAMESPACE);
+//                SessionStorage.INSTANCE.set(USER_RECOMMENDATION_KEY, previousOBSelections.toString(), USER_RECOMMENDATION_NAMESPACE);
             }
             navigator.goToOnboardingScreen(context, null, previousOBSelections);
             wasHandled = true;
diff --git a/src/main/java/com/applicaster/onboarding/screen/presentation/onboarding/OnboardingFragment.kt b/src/main/java/com/applicaster/onboarding/screen/presentation/onboarding/OnboardingFragment.kt
index c8f182f..600722a 100644
--- a/src/main/java/com/applicaster/onboarding/screen/presentation/onboarding/OnboardingFragment.kt
+++ b/src/main/java/com/applicaster/onboarding/screen/presentation/onboarding/OnboardingFragment.kt
@@ -31,7 +31,7 @@ import com.applicaster.plugin_manager.push_plugin.PushContract
 import com.applicaster.plugin_manager.push_plugin.PushManager
 import com.applicaster.plugin_manager.push_plugin.helper.PushPluginsType
 import com.applicaster.plugin_manager.push_plugin.listeners.PushTagRegistrationI
-import com.applicaster.session.SessionStorage
+//import com.applicaster.session.SessionStorage
 import com.applicaster.util.OSUtil
 import com.applicaster.util.PreferenceUtil
 import com.google.gson.GsonBuilder
@@ -89,7 +89,7 @@ class OnboardingFragment : Fragment(), OnListFragmentInteractionListener {
         confirmation_button.setOnClickListener {
             registerTags()
             PreferenceUtil.getInstance().setStringArrayPref(USER_RECOMMENDATION_KEY, previousSelections.toTypedArray())
-            SessionStorage.set(USER_RECOMMENDATION_KEY, previousSelections.toString(), USER_RECOMMENDATION_NAMESPACE)
+//            SessionStorage.set(USER_RECOMMENDATION_KEY, previousSelections.toString(), USER_RECOMMENDATION_NAMESPACE)
             hookListener?.onHookFinished()
             activity.finish()
         }
@@ -217,7 +217,7 @@ class OnboardingFragment : Fragment(), OnListFragmentInteractionListener {
         segment?.id?.let {
             previousSelections.remove(it)
             deSelectedItems.add(it)
-            if (previousSelections.size <= 0) {
+            if (previousSelections.size <= 1) {
                 confirmation_button.text = this@OnboardingFragment.onBoardingItem.onboardingTexts.skipOnboarding?.get(userLocale)
                         ?: this@OnboardingFragment.onBoardingItem.onboardingTexts.skipOnboarding?.get(this@OnboardingFragment.onBoardingItem.languages.first())
             }