diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b243968..6a60934 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,7 +44,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name=".activities.LicenseActivity"/>
         <activity android:name=".activities.ImportBrainkeyActivity"/>
         <activity
             android:name=".activities.MainActivity"
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/LicenseActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/LicenseActivity.kt
deleted file mode 100644
index 418eebd..0000000
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/LicenseActivity.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package cy.agorise.bitsybitshareswallet.activities
-
-import android.content.Intent
-import android.os.Bundle
-import android.preference.PreferenceManager
-import androidx.appcompat.app.AppCompatActivity
-import cy.agorise.bitsybitshareswallet.R
-import cy.agorise.bitsybitshareswallet.utils.Constants
-import kotlinx.android.synthetic.main.activity_license.*
-
-class LicenseActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_license)
-
-        // Get version number of the last agreed license version
-        val agreedLicenseVersion = PreferenceManager.getDefaultSharedPreferences(this)
-            .getInt(Constants.KEY_LAST_AGREED_LICENSE_VERSION, 0)
-
-        // If the last agreed license version is the actual one then proceed to the following Activities
-        if (agreedLicenseVersion == Constants.CURRENT_LICENSE_VERSION) {
-            agree()
-        } else {
-            wbLA.loadUrl("file:///android_asset/eula.html")
-
-            btnDisagree.setOnClickListener { finish() }
-
-            btnAgree.setOnClickListener { agree() }
-        }
-    }
-
-    /**
-     * This function stores the version of the current accepted license version into the Shared Preferences and
-     * sends the user to import/create account if there is no active account or to the MainActivity otherwise.
-     */
-    private fun agree() {
-        PreferenceManager.getDefaultSharedPreferences(this).edit()
-            .putInt(Constants.KEY_LAST_AGREED_LICENSE_VERSION, Constants.CURRENT_LICENSE_VERSION).apply()
-
-        val intent : Intent?
-
-        val initialSetupDone = PreferenceManager.getDefaultSharedPreferences(this)
-            .getBoolean(Constants.KEY_INITIAL_SETUP_DONE, false)
-
-        intent = if (!initialSetupDone)
-            Intent(this, ImportBrainkeyActivity::class.java)
-        else
-            Intent(this, MainActivity::class.java)
-
-
-        startActivity(intent)
-        finish()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/SplashActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/SplashActivity.kt
index ccb60d4..5d0b2b0 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/SplashActivity.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/SplashActivity.kt
@@ -9,7 +9,7 @@ class SplashActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val intent = Intent(this, LicenseActivity::class.java)
+        val intent = Intent(this, MainActivity::class.java)
         startActivity(intent)
         finish()
     }
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ConnectedFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ConnectedFragment.kt
index 2452070..65e4e92 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ConnectedFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ConnectedFragment.kt
@@ -20,7 +20,7 @@ import io.reactivex.disposables.CompositeDisposable
  * Base fragment that defines the methods and variables commonly used in all fragments that directly connect and
  * talk to the BitShares nodes through graphenej's NetworkService
  */
-abstract class ConnectedFragment: Fragment(), ServiceConnection {
+abstract class ConnectedFragment : Fragment(), ServiceConnection {
 
     companion object {
         private const val TAG = "ConnectedFragment"
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
index c9b36d9..e213fcc 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
@@ -45,13 +45,22 @@ class HomeFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        // Get version number of the last agreed license version
+        val agreedLicenseVersion = PreferenceManager.getDefaultSharedPreferences(context)
+            .getInt(Constants.KEY_LAST_AGREED_LICENSE_VERSION, 0)
+
+        val userId = PreferenceManager.getDefaultSharedPreferences(context)
+            .getString(Constants.KEY_CURRENT_ACCOUNT_ID, "") ?: ""
+
+        if (agreedLicenseVersion != Constants.CURRENT_LICENSE_VERSION || userId == "") {
+            findNavController().navigate(R.id.setup_action)
+            return
+        }
+
         // Configure UserAccountViewModel to show the current account
         mUserAccountViewModel = ViewModelProviders.of(this).get(UserAccountViewModel::class.java)
 
-        val userId = PreferenceManager.getDefaultSharedPreferences(context)
-            .getString(Constants.KEY_CURRENT_ACCOUNT_ID, "")
-
-        mUserAccountViewModel.getUserAccount(userId!!).observe(this, Observer<UserAccount>{ user ->
+        mUserAccountViewModel.getUserAccount(userId).observe(this, Observer<UserAccount>{ user ->
             tvAccountName.text = user.name
         })
 
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/LicenseFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/LicenseFragment.kt
new file mode 100644
index 0000000..385b7d1
--- /dev/null
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/LicenseFragment.kt
@@ -0,0 +1,66 @@
+package cy.agorise.bitsybitshareswallet.fragments
+
+import android.os.Bundle
+import android.preference.PreferenceManager
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import cy.agorise.bitsybitshareswallet.R
+import cy.agorise.bitsybitshareswallet.utils.Constants
+import kotlinx.android.synthetic.main.fragment_license.*
+
+class LicenseFragment : Fragment() {
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        // Remove up navigation icon from the toolbar
+        val toolbar: Toolbar? = activity?.findViewById(R.id.toolbar)
+        toolbar?.navigationIcon = null
+
+        return inflater.inflate(R.layout.fragment_license, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Get version number of the last agreed license version
+        val agreedLicenseVersion = PreferenceManager.getDefaultSharedPreferences(context)
+            .getInt(Constants.KEY_LAST_AGREED_LICENSE_VERSION, 0)
+
+        // If the last agreed license version is the actual one then proceed to the following Activities
+        if (agreedLicenseVersion == Constants.CURRENT_LICENSE_VERSION) {
+            agree()
+        } else {
+            wbLA.loadUrl("file:///android_asset/eula.html")
+
+            btnDisagree.setOnClickListener { activity?.finish() }
+
+            btnAgree.setOnClickListener { agree() }
+        }
+    }
+
+    /**
+     * This function stores the version of the current accepted license version into the Shared Preferences and
+     * sends the user to import/create account if there is no active account or to the MainActivity otherwise.
+     */
+    private fun agree() {
+        PreferenceManager.getDefaultSharedPreferences(context).edit()
+            .putInt(Constants.KEY_LAST_AGREED_LICENSE_VERSION, Constants.CURRENT_LICENSE_VERSION).apply()
+
+//        val intent : Intent?
+//
+//        val initialSetupDone = PreferenceManager.getDefaultSharedPreferences(this)
+//            .getBoolean(Constants.KEY_INITIAL_SETUP_DONE, false)
+//
+//        intent = if (!initialSetupDone)
+//            Intent(this, ImportBrainkeyActivity::class.java)
+//        else
+//            Intent(this, MainActivity::class.java)
+//
+//
+//        startActivity(intent)
+//        finish()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt
index f404a82..7aa59cf 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt
@@ -8,9 +8,6 @@ object Constants {
     /** Version of the currently used license */
     const val CURRENT_LICENSE_VERSION = 1
 
-    /** Key used to store if the initial setup is already done or not */
-    const val KEY_INITIAL_SETUP_DONE = "key_initial_setup_done"
-
     /** Key used to store the id value of the currently active account in the shared preferences */
     const val KEY_CURRENT_ACCOUNT_ID = "key_current_account_id"
 
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/fragment_license.xml
similarity index 100%
rename from app/src/main/res/layout/activity_license.xml
rename to app/src/main/res/layout/fragment_license.xml
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 1e2c596..3981905 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -35,6 +35,13 @@
             app:exitAnim="@anim/slide_out_left"
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right"/>
+
+        <action
+            android:id="@+id/setup_action"
+            app:destination="@id/navigation_setup"
+            app:popUpTo="@id/home_dest"
+            app:popUpToInclusive="true"/>
+
     </fragment>
 
     <fragment
@@ -73,4 +80,16 @@
             android:defaultValue="false" />
     </fragment>
 
+    <navigation
+        android:id="@+id/navigation_setup"
+        app:startDestination="@id/license_dest">
+
+        <fragment
+            android:id="@+id/license_dest"
+            android:name="cy.agorise.bitsybitshareswallet.fragments.LicenseFragment"
+            android:label="LicenseFragment"
+            tools:layout="@layout/fragment_license"/>
+
+    </navigation>
+
 </navigation>
\ No newline at end of file