diff --git a/modules/app/src/main/AndroidManifest.xml b/modules/app/src/main/AndroidManifest.xml
index 01daf14ca..be6d78878 100644
--- a/modules/app/src/main/AndroidManifest.xml
+++ b/modules/app/src/main/AndroidManifest.xml
@@ -89,7 +89,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="http" />
                 <data android:scheme="https" />
-                <data android:host="www.9cards.io" />
+                <data android:host="9c.io" android:pathPrefix="/shared-collection" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -97,7 +97,23 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="http" />
                 <data android:scheme="https" />
-                <data android:host="nine.cards" />
+                <data android:host="www.9c.io" android:pathPrefix="/shared-collection" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="www.9cards.io" android:pathPrefix="/shared-collection" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="nine.cards" android:pathPrefix="/shared-collection" />
             </intent-filter>
         </activity>
 
diff --git a/modules/app/src/main/res/values-sw400dp/dimens.xml b/modules/app/src/main/res/values-sw400dp/dimens.xml
index 6641fbf1a..11db1f899 100644
--- a/modules/app/src/main/res/values-sw400dp/dimens.xml
+++ b/modules/app/src/main/res/values-sw400dp/dimens.xml
@@ -36,7 +36,7 @@
 
     <dimen name="height_search_box">48dp</dimen>
 
-    <dimen name="wizard_height_image_content">380dp</dimen>
-    <dimen name="wizard_height_header_steps">340dp</dimen>
+    <dimen name="wizard_height_image_content">360dp</dimen>
+    <dimen name="wizard_height_header_steps">320dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/app/src/main/res/values-sw600dp/dimens.xml b/modules/app/src/main/res/values-sw600dp/dimens.xml
index 6641fbf1a..11db1f899 100644
--- a/modules/app/src/main/res/values-sw600dp/dimens.xml
+++ b/modules/app/src/main/res/values-sw600dp/dimens.xml
@@ -36,7 +36,7 @@
 
     <dimen name="height_search_box">48dp</dimen>
 
-    <dimen name="wizard_height_image_content">380dp</dimen>
-    <dimen name="wizard_height_header_steps">340dp</dimen>
+    <dimen name="wizard_height_image_content">360dp</dimen>
+    <dimen name="wizard_height_header_steps">320dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/modules/app/src/main/res/values/config.xml b/modules/app/src/main/res/values/config.xml
index 16fd5ea48..307df9ab8 100644
--- a/modules/app/src/main/res/values/config.xml
+++ b/modules/app/src/main/res/values/config.xml
@@ -25,7 +25,7 @@
     <string name="user_id_key">ninecards-user-id</string>
     <string name="bluetooth_key">bluetooth-devices</string>
 
-    <string name="shared_collection_url">http://nine.cards/collections/id/%1$s</string>
+    <string name="shared_collection_url">http://9c.io/shared-collection/%1$s</string>
 
     <!-- Crashlytics -->
     <string name="crashlytics_enabled">${crashlytics.enabled}</string>
@@ -41,10 +41,11 @@
     <string name="follow_us_google_plus">https://plus.google.com/+47deg</string>
     <string name="open_source">http://github.com/47deg</string>
     <string name="web_47">http://www.47deg.com</string>
+    <string name="web_tos">http://9c.io/tos</string>
     <string name="nine_cards_github">https://github.com/47deg/nine-cards-v2/</string>
 
     <!-- Preferences Help -->
-    <string name="ninecards_help">https://47deg.github.io/nine-cards-v2</string>
+    <string name="ninecards_help">http://www.9cards.io/</string>
 
     <!-- Firebase -->
     <string name="firebase_enabled" translatable="false">${firebase.enabled}</string>
diff --git a/modules/app/src/main/res/values/dimens.xml b/modules/app/src/main/res/values/dimens.xml
index 15d23d9d3..b97ff66b5 100644
--- a/modules/app/src/main/res/values/dimens.xml
+++ b/modules/app/src/main/res/values/dimens.xml
@@ -116,8 +116,8 @@
 
     <dimen name="margin_left_subtitle">40dp</dimen>
 
-    <dimen name="wizard_height_image_content">320dp</dimen>
-    <dimen name="wizard_height_header_steps">300dp</dimen>
+    <dimen name="wizard_height_image_content">300dp</dimen>
+    <dimen name="wizard_height_header_steps">280dp</dimen>
 
     <dimen name="wizard_size_checkbox_title">24dp</dimen>
     <dimen name="wizard_size_checkbox_collection">38dp</dimen>
diff --git a/modules/app/src/main/res/values/strings.xml b/modules/app/src/main/res/values/strings.xml
index f880ab0f1..daa270dab 100644
--- a/modules/app/src/main/res/values/strings.xml
+++ b/modules/app/src/main/res/values/strings.xml
@@ -46,7 +46,7 @@
 
     <string name="termsAndConditions">
         <![CDATA[
-            by continuing, you accept the<br/><u>Terms of Use</u> and <u>Privacy Policy</u>.
+            by continuing, you accept the<br/><u>Terms of Use and Privacy Policy</u>.
         ]]>
     </string>
 
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/applinks/AppLinksReceiverJobs.scala b/modules/app/src/main/scala/cards/nine/app/ui/applinks/AppLinksReceiverJobs.scala
index 46eda615e..82e3aac0d 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/applinks/AppLinksReceiverJobs.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/applinks/AppLinksReceiverJobs.scala
@@ -24,7 +24,7 @@ class AppLinksReceiverJobs(actions: AppLinksReceiverUiActions)(
     def safeExtractPath: Option[String] =
       Option(uri) flatMap (u => Option(u.getPath))
 
-    val CollectionsPathRegex = "\\/collections\\/id\\/(.+)".r
+    val CollectionsPathRegex = "\\/shared-collection\\/(.+)".r
 
     def openInBrowser(uri: Uri): TaskService[Unit] =
       for {
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/wizard/WizardActivity.scala b/modules/app/src/main/scala/cards/nine/app/ui/wizard/WizardActivity.scala
index 855c38bc8..1e4aa99e1 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/wizard/WizardActivity.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/wizard/WizardActivity.scala
@@ -70,6 +70,9 @@ class WizardActivity
   override def onClickAcceptTermsButton(): Unit =
     wizardJobs.connectAccount().resolveAsync()
 
+  override def onClickVisitTermsButton(): Unit =
+    wizardJobs.showTermOfUseWebsite().resolveAsync()
+
   override def onClickSelectV1DeviceButton(packages: Seq[PackagesByCategory]): Unit =
     wizardJobs
       .deviceSelected(packages)
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/WizardJobs.scala b/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/WizardJobs.scala
index 165687567..18e559ba3 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/WizardJobs.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/WizardJobs.scala
@@ -146,6 +146,9 @@ class WizardJobs(
     }
   }
 
+  def showTermOfUseWebsite(): TaskService[Unit] =
+    di.launcherExecutorProcess.launchUrl(resGetString(R.string.web_tos))
+
   def deviceSelected(packages: Seq[PackagesByCategory]): TaskService[Unit] =
     for {
       _              <- di.trackEventProcess.chooseNewConfiguration()
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/uiactions/WizardDOM.scala b/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/uiactions/WizardDOM.scala
index 94411b8e4..f292b76ad 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/uiactions/WizardDOM.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/uiactions/WizardDOM.scala
@@ -186,6 +186,8 @@ trait WizardUiListener {
 
   def onClickAcceptTermsButton(): Unit
 
+  def onClickVisitTermsButton(): Unit
+
   def onClickSelectV1DeviceButton(packages: Seq[PackagesByCategory]): Unit
 
   def onClickSelectDeviceButton(maybeCloudId: Option[String]): Unit
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/uiactions/WizardUiActions.scala b/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/uiactions/WizardUiActions.scala
index f9d29adeb..93e9beb1a 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/uiactions/WizardUiActions.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/wizard/jobs/uiactions/WizardUiActions.scala
@@ -129,7 +129,9 @@ class WizardUiActions(dom: WizardDOM, listener: WizardUiListener)(
             })
         })) ~
       (dom.userTitle <~ tvText(Html.fromHtml(resGetString(R.string.welcome)))) ~
-      (dom.usersTerms <~ tvText(Html.fromHtml(resGetString(R.string.termsAndConditions)))) ~
+      (dom.usersTerms <~
+        tvText(Html.fromHtml(resGetString(R.string.termsAndConditions))) <~
+        On.click(Ui(listener.onClickVisitTermsButton()))) ~
       (dom.stepsAction <~
         diveInActionStyle <~
         On.click(Ui(listener.onClickFinishWizardButton()))) ~