diff --git a/app/build.gradle b/app/build.gradle
index bd21692..6fa24b9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "cy.agorise.bitsywallet"
+        applicationId "cy.agorise.bitsybitshareswallet"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
diff --git a/app/src/androidTest/java/cy/agorise/bitsywallet/ExampleInstrumentedTest.kt b/app/src/androidTest/java/cy/agorise/bitsybitshareswallet/ExampleInstrumentedTest.kt
similarity index 81%
rename from app/src/androidTest/java/cy/agorise/bitsywallet/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/cy/agorise/bitsybitshareswallet/ExampleInstrumentedTest.kt
index 5c28fe1..c4aebfd 100644
--- a/app/src/androidTest/java/cy/agorise/bitsywallet/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/cy/agorise/bitsybitshareswallet/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package cy.agorise.bitsywallet
+package cy.agorise.bitsybitshareswallet
 
 import android.support.test.InstrumentationRegistry
 import android.support.test.runner.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("cy.agorise.bitsywallet", appContext.packageName)
+        assertEquals("cy.agorise.bitsybitshareswallet", appContext.packageName)
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 70ffedf..a3b1ec3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools" package="cy.agorise.bitsywallet">
+          xmlns:tools="http://schemas.android.com/tools" package="cy.agorise.bitsybitshareswallet">
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/cy/agorise/bitsywallet/activities/MainActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
similarity index 88%
rename from app/src/main/java/cy/agorise/bitsywallet/activities/MainActivity.kt
rename to app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
index e8e0fb2..9f0bb1a 100644
--- a/app/src/main/java/cy/agorise/bitsywallet/activities/MainActivity.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
@@ -1,6 +1,5 @@
-package cy.agorise.bitsywallet.activities
+package cy.agorise.bitsybitshareswallet.activities
 
-import android.support.design.widget.TabLayout
 import android.support.design.widget.Snackbar
 import android.support.v7.app.AppCompatActivity
 
@@ -13,7 +12,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import cy.agorise.bitsywallet.R
+import cy.agorise.bitsybitshareswallet.R
 
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.fragment_main.view.*
@@ -34,16 +33,17 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        setSupportActionBar(toolbar)
+        //setSupportActionBar(toolbar)
         // Create the adapter that will return a fragment for each of the three
         // primary sections of the activity.
         mSectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager)
 
         // Set up the ViewPager with the sections adapter.
-        container.adapter = mSectionsPagerAdapter
+        viewPager.adapter = mSectionsPagerAdapter
+        tabLayout.setupWithViewPager(viewPager)
 
-        container.addOnPageChangeListener(TabLayout.TabLayoutOnPageChangeListener(tabs))
-        tabs.addOnTabSelectedListener(TabLayout.ViewPagerOnTabSelectedListener(container))
+        // Force first tab to show BTS icon
+        tabLayout.getTabAt(0)?.setIcon(R.drawable.bts_logo)
 
         fab.setOnClickListener { view ->
             Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
@@ -89,6 +89,14 @@ class MainActivity : AppCompatActivity() {
             // Show 3 total pages.
             return 3
         }
+
+        override fun getPageTitle(position: Int): CharSequence? {
+            return when (position) {
+                0 -> ""
+                1 -> "Transactions"
+                else -> "Merchants"
+            }
+        }
     }
 
     /**
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d2636e9..7389f67 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,46 +16,27 @@
         android:paddingTop="@dimen/appbar_padding_top"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            app:title="@string/app_name"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_weight="1"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"
-            app:layout_scrollFlags="scroll|enterAlways">
+        <!--<android.support.v7.widget.Toolbar-->
+            <!--android:id="@+id/toolbar"-->
+            <!--app:title="@string/app_name"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="?attr/actionBarSize"-->
+            <!--android:layout_weight="1"-->
+            <!--android:background="?attr/colorPrimary"-->
+            <!--app:popupTheme="@style/AppTheme.PopupOverlay"-->
+            <!--app:layout_scrollFlags="scroll|enterAlways">-->
 
-        </android.support.v7.widget.Toolbar>
+        <!--</android.support.v7.widget.Toolbar>-->
 
         <android.support.design.widget.TabLayout
-            android:id="@+id/tabs"
+            android:id="@+id/tabLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content" />
 
-            <android.support.design.widget.TabItem
-                android:id="@+id/tabItem"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_text_1"/>
-
-            <android.support.design.widget.TabItem
-                android:id="@+id/tabItem2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_text_2"/>
-
-            <android.support.design.widget.TabItem
-                android:id="@+id/tabItem3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_text_3"/>
-
-        </android.support.design.widget.TabLayout>
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v4.view.ViewPager
-        android:id="@+id/container"
+        android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 4994849..0af865e 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
       xmlns:tools="http://schemas.android.com/tools"
-      tools:context="cy.agorise.bitsywallet.activities.MainActivity">
+      tools:context="cy.agorise.bitsybitshareswallet.activities.MainActivity">
     <item android:id="@+id/action_settings"
           android:title="@string/action_settings"
           android:orderInCategory="100"
diff --git a/app/src/test/java/cy/agorise/bitsywallet/ExampleUnitTest.kt b/app/src/test/java/cy/agorise/bitsybitshareswallet/ExampleUnitTest.kt
similarity index 88%
rename from app/src/test/java/cy/agorise/bitsywallet/ExampleUnitTest.kt
rename to app/src/test/java/cy/agorise/bitsybitshareswallet/ExampleUnitTest.kt
index 9318997..1ce4f80 100644
--- a/app/src/test/java/cy/agorise/bitsywallet/ExampleUnitTest.kt
+++ b/app/src/test/java/cy/agorise/bitsybitshareswallet/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package cy.agorise.bitsywallet
+package cy.agorise.bitsybitshareswallet
 
 import org.junit.Test