diff --git a/CREDITS b/CREDITS
new file mode 100644
index 0000000..f42231f
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1 @@
+Duke Leto
diff --git a/app/build.gradle b/app/build.gradle
index c3c5ccf..5b14539 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 // Copyright 2019 The Hush developers
+// Released under the GPLv3
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
@@ -18,7 +19,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
-        versionName "0.6.0-alpha3"
+        versionName "0.6.0-alpha4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt b/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt
index 9684d06..5a584ee 100644
--- a/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt
+++ b/app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt
@@ -70,14 +70,20 @@ class ReceiveActivity : AppCompatActivity() {
 
         val addrTxt = findViewById<TextView>(R.id.addressTxt)
 
-        val numsplits = if (addr!!.length > 48) 8 else 4
+        var numsplits = if (addr!!.length > 34) 8 else 6
         val size = addr!!.length / numsplits
 
         var splitText = ""
         for (i in 0..(numsplits-1)) {
             splitText += addr?.substring(i * size, i * size + size)
             splitText += if (i % 2 == 0) " " else "\n"
+
+            if (i == (numsplits-1))
+                if(addr!!.length % numsplits != 0) {
+                    splitText += addr?.substring((i + 1) * size, addr!!.length)
+                }
         }
+
         addrTxt.text = splitText
 
         addrTxt.setOnClickListener {
diff --git a/app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt b/app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt
index 55953b0..1ec0c74 100644
--- a/app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt
+++ b/app/src/main/java/org/myhush/silentdragon/TxDetailsActivity.kt
@@ -39,6 +39,7 @@ class TxDetailsActivity : AppCompatActivity() {
             imgTypeColor.setImageResource(R.color.colorAccent)
 
         if (tx?.type == "confirm") {
+
             txtType.text = "Confirm Transaction"
             txtDateTime.text = ""
             btnExternal.text = "Confirm and Send"
@@ -119,6 +120,11 @@ class TxDetailsActivity : AppCompatActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.menu_txdetails, menu)
+
+        tx = Klaxon().parse(StringReader(intent.getStringExtra("EXTRA_TXDETAILS")))
+        if (tx?.type == "confirm") {
+            menu!!.removeItem(R.id.action_view)
+        }
         return true
     }
 
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 2c5927c..c376813 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<ScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -18,39 +18,66 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="1.0">
 
-        <LinearLayout
-            android:id="@+id/linearLayout"
-            android:layout_width="0dp"
+        <TextView
+            android:id="@+id/Website"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:text="Visit our website"
+            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/textView"
+            android:id="@+id/WebsiteText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:text="https://www.myhush.org"
+            android:textColorLink="@android:color/white"
+            android:autoLink="web"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/Website" />
+
+        <View
+            android:id="@+id/divider1"
+            android:layout_width="0dp"
+            android:layout_height="2dp"
+            android:layout_marginStart="8dp"
             android:layout_marginTop="16dp"
-            android:text="SilentDragonAndroid version"
+            android:layout_marginEnd="8dp"
+            android:background="?android:attr/listDivider"
+            android:visibility="visible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/WebsiteText" />
+
+        <TextView
+            android:id="@+id/Discord"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:text="Join our Discord"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/divider1" />
 
         <TextView
-            android:id="@+id/lblVersionName"
+            android:id="@+id/DiscordText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:text="version"
+            android:layout_marginTop="2dp"
+            android:text="https://www.myhush.org/discord/"
+            android:textColorLink="@android:color/white"
+            android:autoLink="web"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView" />
+            app:layout_constraintTop_toBottomOf="@+id/Discord" />
 
         <View
-            android:id="@+id/divider"
+            android:id="@+id/divider2"
             android:layout_width="0dp"
             android:layout_height="2dp"
             android:layout_marginStart="8dp"
@@ -59,36 +86,107 @@
             android:background="?android:attr/listDivider"
             android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/lblVersionName" />
-            tools:layout_editor_absoluteY="56dp" />
+            app:layout_constraintTop_toBottomOf="@+id/DiscordText" />
 
         <TextView
-            android:id="@+id/Copyright"
+            android:id="@+id/Twitter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:text="Twitter"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/divider2" />
+
+        <TextView
+            android:id="@+id/TwitterText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:text="https://www.myhush.org/twitter/"
+            android:textColorLink="@android:color/white"
+            android:autoLink="web"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/Twitter" />
+
+        <View
+            android:id="@+id/divider3"
+            android:layout_width="0dp"
+            android:layout_height="2dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:background="?android:attr/listDivider"
+            android:visibility="visible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/TwitterText" />
+
+        <TextView
+            android:id="@+id/Github"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:text="GitHub"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/divider3" />
+
+        <TextView
+            android:id="@+id/GithubText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:text="https://github.com/MyHush/SilentDragonAndroid"
+            android:textColorLink="@android:color/white"
+            android:autoLink="web"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/Github" />
+
+        <View
+            android:id="@+id/divider4"
+            android:layout_width="0dp"
+            android:layout_height="2dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:background="?android:attr/listDivider"
+            android:visibility="visible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/GithubText" />
+
+        <TextView
+            android:id="@+id/Credit"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
-            android:text="Copyright"
+            android:text="Credits"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/divider" />
+            app:layout_constraintTop_toBottomOf="@id/divider4" />
 
         <TextView
-            android:id="@+id/CopyrightText"
+            android:id="@+id/CreditText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="2dp"
             android:layout_marginEnd="16dp"
-            android:text="2019 The Hush developers"
+            android:text="http://www.myhush.org/credits_SDA/"
+            android:textColorLink="@android:color/white"
+            android:autoLink="web"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/Copyright" />
+            app:layout_constraintTop_toBottomOf="@id/Credit" />
 
         <View
-            android:id="@+id/divider2"
+            android:id="@+id/divider5"
             android:layout_width="0dp"
             android:layout_height="2dp"
             android:layout_marginStart="8dp"
@@ -97,7 +195,7 @@
             android:background="?android:attr/listDivider"
             android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/CopyrightText" />
+            app:layout_constraintTop_toBottomOf="@+id/CreditText" />
             tools:layout_editor_absoluteY="56dp" />
 
         <TextView
@@ -111,14 +209,14 @@
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/divider2" />
+            app:layout_constraintTop_toBottomOf="@id/divider5" />
 
         <TextView
             android:id="@+id/LicenseText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="2dp"
             android:layout_marginEnd="16dp"
             android:text="GNU Public License V3"
             app:layout_constraintEnd_toEndOf="parent"
@@ -126,17 +224,88 @@
             app:layout_constraintTop_toBottomOf="@+id/License" />
 
         <View
-            android:id="@+id/divider3"
+            android:id="@+id/divider6"
             android:layout_width="0dp"
             android:layout_height="2dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="2dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="8dp"
             android:background="?android:attr/listDivider"
             android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/LicenseText" />
-        tools:layout_editor_absoluteY="56dp" />
+
+
+        <TextView
+            android:id="@+id/Version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:text="SilentDragonAndroid version"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/divider6" />
+
+        <TextView
+            android:id="@+id/lblVersionName"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            android:text="version"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/Version" />
+
+        <View
+            android:id="@+id/divider7"
+            android:layout_width="0dp"
+            android:layout_height="2dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:background="?android:attr/listDivider"
+            android:visibility="visible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/lblVersionName" />
+
+        <TextView
+            android:id="@+id/Copyright"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="Copyright"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/divider7" />
+
+        <TextView
+            android:id="@+id/CopyrightText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            android:text="2019 The Hush developers"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/Copyright" />
+
+        <View
+            android:id="@+id/divider8"
+            android:layout_width="0dp"
+            android:layout_height="2dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:background="?android:attr/listDivider"
+            android:visibility="visible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/CopyrightText" />
 
     </android.support.constraint.ConstraintLayout>
-</android.support.constraint.ConstraintLayout>
+</ScrollView>