From 144e26d32b3d697df72c97a65538751819958d62 Mon Sep 17 00:00:00 2001
From: Aaron Huttner <Double@Aarons-MacBook-Pro.local>
Date: Tue, 6 Sep 2016 16:33:14 -0400
Subject: [PATCH] version bump and update production url update production url
 gradle update normalize spanish characters and remove diacritics update field
 lengths #101 update about screen #97 update register button #100 update
 english translations #102 update spanish text for sending sms checkbox #94
 chagne Partner Name to Organization #105 Make opts in for email and phone
 pre-checked #104 remove large total registered count #103

---
 .idea/codeStyleSettings.xml                   | 229 -----------
 .idea/gradle.xml                              |   3 +-
 app/build.gradle                              |   6 +-
 .../rockthevote/grommet/data/DataModule.java  |  10 +-
 .../grommet/data/api/Normalize.java           |  15 +
 .../data/api/StringNormalizerFactory.java     |  55 +++
 .../data/api/model/ApiAdditionalInfo.java     |   2 +
 .../grommet/data/api/model/ApiAddress.java    |   4 +
 .../grommet/data/api/model/ApiName.java       |   6 +
 .../rockthevote/grommet/ui/MainActivity.java  |   8 +-
 .../ReviewAndConfirmFragment.java             |   5 -
 .../rockthevote/grommet/util/MoshiUtils.java  |  61 +++
 .../main/res/drawable/register_a_voter.xml    | 357 +++++++++++++++++
 .../main/res/drawable/register_to_vote.xml    | 365 ------------------
 app/src/main/res/layout/activity_main.xml     |  44 +--
 .../res/layout/fragment_additional_info.xml   |   3 +
 app/src/main/res/layout/view_address.xml      |   3 +
 app/src/main/res/layout/view_name.xml         |   3 +
 app/src/main/res/values-es/strings.xml        |   2 +-
 .../main/res/values/open_source_licenses.xml  |   2 +-
 app/src/main/res/values/strings.xml           |  26 +-
 21 files changed, 538 insertions(+), 671 deletions(-)
 delete mode 100644 .idea/codeStyleSettings.xml
 create mode 100644 app/src/main/java/com/rockthevote/grommet/data/api/Normalize.java
 create mode 100644 app/src/main/java/com/rockthevote/grommet/data/api/StringNormalizerFactory.java
 create mode 100644 app/src/main/java/com/rockthevote/grommet/util/MoshiUtils.java
 create mode 100644 app/src/main/res/drawable/register_a_voter.xml
 delete mode 100644 app/src/main/res/drawable/register_to_vote.xml

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index b6c1cd7c..00000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-          <value />
-        </option>
-        <option name="IMPORT_LAYOUT_TABLE">
-          <value>
-            <package name="android" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="com" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="junit" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="net" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="javax" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="true" />
-            <emptyLine />
-          </value>
-        </option>
-        <option name="RIGHT_MARGIN" value="100" />
-        <AndroidXmlCodeStyleSettings>
-          <option name="USE_CUSTOM_SETTINGS" value="true" />
-        </AndroidXmlCodeStyleSettings>
-        <Objective-C-extensions>
-          <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
-          <option name="RELEASE_STYLE" value="IVAR" />
-          <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
-          <file>
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-          </file>
-          <class>
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-          </class>
-          <extensions>
-            <pair source="cpp" header="h" />
-            <pair source="c" header="h" />
-          </extensions>
-        </Objective-C-extensions>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="XML">
-          <option name="FORCE_REARRANGE_MODE" value="1" />
-          <indentOptions>
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-          </indentOptions>
-          <arrangement>
-            <rules>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>xmlns:android</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>xmlns:.*</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:id</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:name</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>name</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>style</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:layout_width</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:layout_height</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:layout_.*</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:width</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:height</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*</NAME>
-                      <XML_NAMESPACE>.*</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-            </rules>
-          </arrangement>
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0e23f8ed..7ac24c77 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle b/app/build.gradle
index 43f93761..f4c7d629 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -161,9 +161,9 @@ dependencies {
     internalDebugCompile 'com.jakewharton.scalpel:scalpel:1.1.2'
     internalDebugCompile 'com.jakewharton:process-phoenix:1.0.2'
 
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-SNAPSHOT'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-SNAPSHOT'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-SNAPSHOT'
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4'
+//    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4'
 
     internalCompile 'com.mattprecious.telescope:telescope:2.1.0'
 
diff --git a/app/src/main/java/com/rockthevote/grommet/data/DataModule.java b/app/src/main/java/com/rockthevote/grommet/data/DataModule.java
index 685787ab..83aa4cd4 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/DataModule.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/DataModule.java
@@ -9,8 +9,8 @@
 import com.rockthevote.grommet.data.api.ApiModule;
 import com.rockthevote.grommet.data.api.RegistrationService;
 import com.rockthevote.grommet.data.api.RockyAdapterFactory;
+import com.rockthevote.grommet.data.api.StringNormalizerFactory;
 import com.rockthevote.grommet.data.db.DbModule;
-import com.rockthevote.grommet.data.prefs.AppRegTotal;
 import com.rockthevote.grommet.data.prefs.CanvasserName;
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
 import com.rockthevote.grommet.data.prefs.EventName;
@@ -73,13 +73,6 @@ Preference<Integer> provideEventRegTotal(RxSharedPreferences prefs, Application
         return prefs.getInteger(app.getResources().getString(R.string.pref_key_event_reg_total), 0);
     }
 
-    @Provides
-    @Singleton
-    @AppRegTotal
-    Preference<Integer> provideAppRegTotal(RxSharedPreferences prefs, Application app){
-        return prefs.getInteger(app.getResources().getString(R.string.pref_key_app_reg_total), 0);
-    }
-
     @Provides
     @Singleton
     @PartnerId
@@ -126,6 +119,7 @@ Preference<Long> provideCurrentRockyRequestId(RxSharedPreferences prefs) {
     @Singleton
     Moshi provideMoshi() {
         return new Moshi.Builder()
+                .add(new StringNormalizerFactory())
                 .add(RockyAdapterFactory.create())
                 .build();
     }
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/Normalize.java b/app/src/main/java/com/rockthevote/grommet/data/api/Normalize.java
new file mode 100644
index 00000000..152efd55
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/Normalize.java
@@ -0,0 +1,15 @@
+package com.rockthevote.grommet.data.api;
+
+import com.squareup.moshi.JsonQualifier;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Created by Aaron Huttner on 9/23/16. Grommet
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@JsonQualifier
+public @interface Normalize {
+}
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/StringNormalizerFactory.java b/app/src/main/java/com/rockthevote/grommet/data/api/StringNormalizerFactory.java
new file mode 100644
index 00000000..fa805710
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/StringNormalizerFactory.java
@@ -0,0 +1,55 @@
+package com.rockthevote.grommet.data.api;
+
+import com.rockthevote.grommet.util.MoshiUtils;
+import com.squareup.moshi.JsonAdapter;
+import com.squareup.moshi.JsonReader;
+import com.squareup.moshi.JsonWriter;
+import com.squareup.moshi.Moshi;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.text.Normalizer;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+
+/**
+ * Created by Aaron Huttner on 9/23/16. Grommet
+ */
+
+public class StringNormalizerFactory implements JsonAdapter.Factory {
+
+    private static final String regex = Pattern.quote("[\\p{InCombiningDiacriticalMarks}\\p{IsLm}\\p{IsSk}]+");
+    private static final Pattern DIACRITICS_AND_FRIENDS = Pattern.compile(regex);
+
+    private static String stripDiacritics(String str) {
+        str = Normalizer.normalize(str, Normalizer.Form.NFD);
+        str = DIACRITICS_AND_FRIENDS.matcher(str).replaceAll("");
+        return str;
+    }
+
+    @Override
+    public JsonAdapter<?> create(
+            Type type, Set<? extends Annotation> annotations, Moshi moshi) {
+        if (!type.equals(String.class)) return null;
+        if (!MoshiUtils.isAnnotationPresent(annotations, Normalize.class)) return null;
+
+        final JsonAdapter<String> stringAdapter
+                = moshi.nextAdapter(this, String.class, MoshiUtils.NO_ANNOTATIONS);
+        return new JsonAdapter<String>() {
+            @Override
+            public String fromJson(JsonReader reader) throws IOException {
+                String s = stringAdapter.fromJson(reader);
+                return stripDiacritics(s);
+            }
+
+            @Override
+            public void toJson(JsonWriter writer, String value) throws IOException {
+                stringAdapter.toJson(writer, stripDiacritics(value));
+            }
+        };
+    }
+
+
+}
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiAdditionalInfo.java b/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiAdditionalInfo.java
index 4a4c5e0a..9e7ff7f2 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiAdditionalInfo.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiAdditionalInfo.java
@@ -3,6 +3,7 @@
 import android.support.annotation.Nullable;
 
 import com.google.auto.value.AutoValue;
+import com.rockthevote.grommet.data.api.Normalize;
 import com.rockthevote.grommet.data.db.model.AdditionalInfo;
 import com.squareup.moshi.Json;
 import com.squareup.moshi.JsonAdapter;
@@ -13,6 +14,7 @@ public abstract class ApiAdditionalInfo {
 
     abstract String name();
 
+    @Normalize
     @Json(name = "string_value")
     abstract String stringValue();
 
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiAddress.java b/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiAddress.java
index b54c8945..e682de77 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiAddress.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiAddress.java
@@ -4,6 +4,7 @@
 import android.support.annotation.Nullable;
 
 import com.google.auto.value.AutoValue;
+import com.rockthevote.grommet.data.api.Normalize;
 import com.rockthevote.grommet.data.db.model.Address;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.JsonReader;
@@ -15,10 +16,13 @@
 @AutoValue
 public abstract class ApiAddress {
 
+    @Normalize
     abstract String streetName();
 
+    @Normalize
     abstract String subAddress();
 
+    @Normalize
     abstract String municipalJurisdiction();
 
     abstract String county();
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiName.java b/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiName.java
index 1b2d6870..e931af70 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiName.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/model/ApiName.java
@@ -3,6 +3,8 @@
 import android.support.annotation.Nullable;
 
 import com.google.auto.value.AutoValue;
+import com.rockthevote.grommet.data.api.Normalize;
+import com.rockthevote.grommet.data.api.StringNormalizerFactory;
 import com.rockthevote.grommet.data.db.model.Name;
 import com.squareup.moshi.Json;
 import com.squareup.moshi.JsonAdapter;
@@ -10,12 +12,16 @@
 
 @AutoValue
 public abstract class ApiName {
+
+    @Normalize
     @Json(name = "first_name")
     abstract String firstName();
 
+    @Normalize
     @Json(name = "last_name")
     abstract String lastName();
 
+    @Normalize
     @Json(name = "middle_name")
     abstract String middleName();
 
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/MainActivity.java b/app/src/main/java/com/rockthevote/grommet/ui/MainActivity.java
index 253bda74..49ffa5e2 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/MainActivity.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/MainActivity.java
@@ -16,7 +16,6 @@
 import com.f2prateek.rx.preferences.Preference;
 import com.rockthevote.grommet.R;
 import com.rockthevote.grommet.data.db.model.RockyRequest;
-import com.rockthevote.grommet.data.prefs.AppRegTotal;
 import com.rockthevote.grommet.data.prefs.CanvasserName;
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
 import com.rockthevote.grommet.data.prefs.EventName;
@@ -47,7 +46,6 @@ public final class MainActivity extends BaseActivity {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.event_details_toolbar) Toolbar eventToolbar;
-    @BindView(R.id.total_registered) TextView totalRegistered;
     @BindView(R.id.registered_for_event) TextView registeredEvent;
     @BindView(R.id.event_details) EventDetails eventDetails;
     @BindView(R.id.editable_action_view) EditableActionView editableActionView;
@@ -64,8 +62,6 @@ public final class MainActivity extends BaseActivity {
 
     @Inject @EventRegTotal Preference<Integer> eventRegTotal;
 
-    @Inject @AppRegTotal Preference<Integer> appRegtotal;
-
     @Inject ViewContainer viewContainer;
 
     @Inject BriteDatabase db;
@@ -112,9 +108,6 @@ protected void onResume() {
 
         subscriptions.add(eventRegTotal.asObservable()
                 .subscribe(eventTotal -> registeredEvent.setText(String.valueOf(eventTotal))));
-
-        subscriptions.add(appRegtotal.asObservable()
-                .subscribe(appTotal -> totalRegistered.setText(String.valueOf(appTotal))));
     }
 
     @Override
@@ -155,6 +148,7 @@ private void createNewVoterRecord() {
                             .partnerTrackingId(eventZipPref.get())
                             .sourceTrackingId(canvasserNamePref.get())
                             .openTrackingId(eventNamePref.get())
+                            .partnerOptInSMS(true) // override database default so we don't have to perform a migration
                             .generateDate();
 
                     if (null != location) {
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
index 0af5971a..9cd0a20b 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
@@ -19,7 +19,6 @@
 import com.rockthevote.grommet.data.db.model.ContactMethod;
 import com.rockthevote.grommet.data.db.model.Name;
 import com.rockthevote.grommet.data.db.model.RockyRequest;
-import com.rockthevote.grommet.data.prefs.AppRegTotal;
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
 import com.rockthevote.grommet.data.prefs.EventRegTotal;
 import com.rockthevote.grommet.util.Dates;
@@ -72,7 +71,6 @@ public class ReviewAndConfirmFragment extends BaseRegistrationFragment implement
     @BindView(R.id.checkbox_agreement) CheckBox confirmCheckbox;
 
     @Inject @EventRegTotal Preference<Integer> eventRegTotal;
-    @Inject @AppRegTotal Preference<Integer> appRegTotal;
 
     @Inject @CurrentRockyRequestId Preference<Long> rockyRequestRowId;
 
@@ -248,9 +246,6 @@ public void onRegisterClick(View v) {
             int totalEvent = eventRegTotal.get();
             eventRegTotal.set(++totalEvent);
 
-            int totalApp = appRegTotal.get();
-            appRegTotal.set(++totalApp);
-
             RegistrationCompleteDialogFragment dialog = new RegistrationCompleteDialogFragment();
             dialog.setCancelable(false);
             dialog.show(getFragmentManager(), "complete_dialog");
diff --git a/app/src/main/java/com/rockthevote/grommet/util/MoshiUtils.java b/app/src/main/java/com/rockthevote/grommet/util/MoshiUtils.java
new file mode 100644
index 00000000..0a02e67a
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/util/MoshiUtils.java
@@ -0,0 +1,61 @@
+package com.rockthevote.grommet.util;
+
+import com.squareup.moshi.JsonQualifier;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+
+/**
+ * Created by Aaron Huttner on 9/23/16. Grommet
+ */
+
+public final class MoshiUtils {
+    public static final Set<Annotation> NO_ANNOTATIONS = Collections.emptySet();
+
+    public static boolean typesMatch(Type pattern, Type candidate) {
+        // TODO: permit raw types (like Set.class) to match non-raw candidates (like Set<Long>).
+        return pattern.equals(candidate);
+    }
+
+    public static Set<? extends Annotation> jsonAnnotations(AnnotatedElement annotatedElement) {
+        return jsonAnnotations(annotatedElement.getAnnotations());
+    }
+
+    public static Set<? extends Annotation> jsonAnnotations(Annotation[] annotations) {
+        Set<Annotation> result = null;
+        for (Annotation annotation : annotations) {
+            if (annotation.annotationType().isAnnotationPresent(JsonQualifier.class)) {
+                if (result == null) result = new LinkedHashSet<>();
+                result.add(annotation);
+            }
+        }
+        return result != null ? Collections.unmodifiableSet(result) : MoshiUtils.NO_ANNOTATIONS;
+    }
+
+    public static boolean isAnnotationPresent(
+            Set<? extends Annotation> annotations, Class<? extends Annotation> annotationClass) {
+        if (annotations.isEmpty()) return false; // Save an iterator in the common case.
+        for (Annotation annotation : annotations) {
+            if (annotation.annotationType() == annotationClass) return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if {@code annotations} has any annotation whose simple name is Nullable.
+     */
+    public static boolean hasNullable(Annotation[] annotations) {
+        for (Annotation annotation : annotations) {
+            if (annotation.annotationType().getSimpleName().equals("Nullable")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/app/src/main/res/drawable/register_a_voter.xml b/app/src/main/res/drawable/register_a_voter.xml
new file mode 100644
index 00000000..e7fb0475
--- /dev/null
+++ b/app/src/main/res/drawable/register_a_voter.xml
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45dp"
+    android:height="38dp"
+    android:viewportWidth="45"
+    android:viewportHeight="38">
+
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:strokeWidth="1"
+        android:pathData="M3.78808594,5.87695312 L2.38769531,5.87695312 L2.38769531,9 L0.629882812,9
+L0.629882812,0.46875 L3.79980469,0.46875 C4.29199465,0.46875
+4.73339648,0.524413506 5.12402344,0.635742188 C5.51465039,0.747070869
+5.84472521,0.911131729 6.11425781,1.12792969 C6.38379041,1.34472765
+6.59081959,1.61327965 6.73535156,1.93359375 C6.87988354,2.25390785
+6.95214844,2.62499789 6.95214844,3.046875 C6.95214844,3.35937656
+6.91699254,3.6396472 6.84667969,3.88769531 C6.77636684,4.13574343
+6.67480535,4.35644435 6.54199219,4.54980469 C6.40917902,4.74316503
+6.24902438,4.91210865 6.06152344,5.05664062 C5.8740225,5.2011726
+5.66308711,5.32617135 5.42871094,5.43164062 L7.27441406,8.91796875 L7.27441406,9
+L5.38769531,9 L3.78808594,5.87695312 Z M2.38769531,4.453125 L3.80566406,4.453125
+C4.03613396,4.453125 4.23828038,4.42285187 4.41210938,4.36230469
+C4.58593837,4.30175751 4.73046817,4.21582087 4.84570312,4.10449219
+C4.96093808,3.99316351 5.04785127,3.86035233 5.10644531,3.70605469
+C5.16503936,3.55175704 5.19433594,3.37890721 5.19433594,3.1875
+C5.19433594,2.78515424 5.08007927,2.46875115 4.8515625,2.23828125
+C4.62304573,2.00781135 4.2724633,1.89257812 3.79980469,1.89257812
+L2.38769531,1.89257812 L2.38769531,4.453125 Z M11.0947266,9.1171875
+C10.6025366,9.1171875 10.1621113,9.03711018 9.7734375,8.87695312
+C9.38476368,8.71679607 9.05468886,8.49804826 8.78320312,8.22070312
+C8.51171739,7.94335799 8.30468821,7.61816593 8.16210938,7.24511719
+C8.01953054,6.87206845 7.94824219,6.47265838 7.94824219,6.046875
+L7.94824219,5.81835938 C7.94824219,5.33788822 8.01757743,4.89746294
+8.15625,4.49707031 C8.29492257,4.09667769 8.49218622,3.75195457
+8.74804688,3.46289062 C9.00390753,3.17382668 9.3144513,2.948243
+9.6796875,2.78613281 C10.0449237,2.62402263 10.4540993,2.54296875
+10.9072266,2.54296875 C11.3642601,2.54296875 11.7665998,2.61816331
+12.1142578,2.76855469 C12.4619158,2.91894606 12.7539051,3.12988146
+12.9902344,3.40136719 C13.2265637,3.67285292 13.4042963,3.99999809
+13.5234375,4.3828125 C13.6425787,4.76562691 13.7021484,5.19140391
+13.7021484,5.66015625 L13.7021484,6.38085938 L9.66503906,6.38085938
+C9.69238295,6.58789166 9.74804646,6.77538979 9.83203125,6.94335938
+C9.91601604,7.11132896 10.0234368,7.25488222 10.1542969,7.37402344
+C10.2851569,7.49316466 10.4384757,7.58593717 10.6142578,7.65234375
+C10.7900399,7.71875033 10.9873036,7.75195312 11.2060547,7.75195312
+C11.51465,7.75195312 11.7998034,7.69433651 12.0615234,7.57910156
+C12.3232435,7.46386661 12.5478506,7.28515746 12.7353516,7.04296875
+L13.5673828,7.97460938 C13.4658198,8.11914135 13.3388679,8.25976494
+13.1865234,8.39648438 C13.0341789,8.53320381 12.8544932,8.6552729
+12.6474609,8.76269531 C12.4404287,8.87011772 12.2070325,8.95605437
+11.9472656,9.02050781 C11.6874987,9.08496126 11.4033219,9.1171875
+11.0947266,9.1171875 L11.0947266,9.1171875 Z M10.9013672,3.9140625
+C10.7177725,3.9140625 10.5566413,3.94628874 10.4179688,4.01074219
+C10.2792962,4.07519563 10.1601567,4.16503849 10.0605469,4.28027344
+C9.960937,4.39550839 9.87988312,4.53320232 9.81738281,4.69335938
+C9.7548825,4.85351643 9.70996107,5.03124902 9.68261719,5.2265625
+L12.0380859,5.2265625 L12.0380859,5.09179688 C12.0341797,4.92382729
+12.0097658,4.76757885 11.9648438,4.62304688 C11.9199217,4.4785149
+11.851563,4.35351615 11.7597656,4.24804688 C11.6679683,4.1425776
+11.550782,4.06054717 11.4082031,4.00195312 C11.2656243,3.94335908
+11.0966807,3.9140625 10.9013672,3.9140625 L10.9013672,3.9140625 Z
+M14.4169922,5.78320312 C14.4169922,5.30273197 14.4765619,4.86328324
+14.5957031,4.46484375 C14.7148443,4.06640426 14.8847645,3.7246108
+15.1054688,3.43945312 C15.326173,3.15429545 15.594725,2.93359453
+15.9111328,2.77734375 C16.2275406,2.62109297 16.5849589,2.54296875
+16.9833984,2.54296875 C17.354494,2.54296875 17.6718737,2.60546813
+17.9355469,2.73046875 C18.1992201,2.85546937 18.4228506,3.03124887
+18.6064453,3.2578125 L18.6767578,2.66015625 L20.2119141,2.66015625
+L20.2119141,8.78320312 C20.2119141,9.21679904 20.1376961,9.60156082
+19.9892578,9.9375 C19.8408196,10.2734392 19.6328138,10.557616
+19.3652344,10.7900391 C19.0976549,11.0224621 18.7773456,11.1982416
+18.4042969,11.3173828 C18.0312481,11.436524 17.6181663,11.4960938
+17.1650391,11.4960938 C16.9697256,11.4960938 16.7626964,11.4765627
+16.5439453,11.4375 C16.3251942,11.3984373 16.1093761,11.337891
+15.8964844,11.2558594 C15.6835927,11.1738277 15.4814463,11.0703131
+15.2900391,10.9453125 C15.0986319,10.8203119 14.9365241,10.6718759
+14.8037109,10.5 L15.5537109,9.46875 C15.7529307,9.69140736 15.9804675,9.86523375
+16.2363281,9.99023438 C16.4921888,10.115235 16.7763656,10.1777344
+17.0888672,10.1777344 C17.5380882,10.1777344 17.8876941,10.0576184
+18.1376953,9.81738281 C18.3876966,9.57714724 18.5126953,9.23633033
+18.5126953,8.79492188 L18.5126953,8.45507812 C18.3251944,8.66601668
+18.1044935,8.82910099 17.8505859,8.94433594 C17.5966784,9.05957089
+17.3037126,9.1171875 16.9716797,9.1171875 C16.5771465,9.1171875
+16.2226578,9.03613362 15.9082031,8.87402344 C15.5937484,8.71191325
+15.326173,8.48828268 15.1054688,8.203125 C14.8847645,7.91796732
+14.7148443,7.57910353 14.5957031,7.18652344 C14.4765619,6.79394335
+14.4169922,6.3671898 14.4169922,5.90625 L14.4169922,5.78320312 Z
+M16.1103516,5.90625 C16.1103516,6.16406379 16.1357419,6.40429576
+16.1865234,6.62695312 C16.2373049,6.84961049 16.3164057,7.04394448
+16.4238281,7.20996094 C16.5312505,7.37597739 16.6660148,7.50683546
+16.828125,7.60253906 C16.9902352,7.69824267 17.1826161,7.74609375
+17.4052734,7.74609375 C17.674806,7.74609375 17.9003897,7.69531301
+18.0820312,7.59375 C18.2636728,7.49218699 18.407226,7.34961029
+18.5126953,7.16601562 L18.5126953,4.5 C18.4033198,4.31249906
+18.2597665,4.16894581 18.0820312,4.06933594 C17.904296,3.96972606
+17.6826185,3.91992188 17.4169922,3.91992188 C17.1943348,3.91992188
+17.0019539,3.96777296 16.8398438,4.06347656 C16.6777336,4.15918017
+16.5419927,4.29101479 16.4326172,4.45898438 C16.3232416,4.62695396
+16.2421878,4.82421762 16.1894531,5.05078125 C16.1367185,5.27734488
+16.1103516,5.52148307 16.1103516,5.78320312 L16.1103516,5.90625 Z M23.2998047,9
+L21.6005859,9 L21.6005859,2.66015625 L23.2998047,2.66015625 L23.2998047,9 Z
+M21.5009766,1.01953125 C21.5009766,0.76562373 21.5859367,0.556641445
+21.7558594,0.392578125 C21.9257821,0.228514805 22.1572251,0.146484375
+22.4501953,0.146484375 C22.5947273,0.146484375 22.7255854,0.167968535
+22.8427734,0.2109375 C22.9599615,0.253906465 23.0595699,0.314452734
+23.1416016,0.392578125 C23.2236332,0.470703516 23.2871092,0.563476025
+23.3320312,0.670898438 C23.3769533,0.77832085 23.3994141,0.894530625
+23.3994141,1.01953125 C23.3994141,1.14843814 23.3769533,1.26660103
+23.3320312,1.37402344 C23.2871092,1.48144585 23.2236332,1.57421836
+23.1416016,1.65234375 C23.0595699,1.73046914 22.9599615,1.79101541
+22.8427734,1.83398438 C22.7255854,1.87695334 22.5947273,1.8984375
+22.4501953,1.8984375 C22.3056633,1.8984375 22.1748053,1.87695334
+22.0576172,1.83398438 C21.9404291,1.79101541 21.8408207,1.73046914
+21.7587891,1.65234375 C21.6767574,1.57421836 21.6132815,1.48144585
+21.5683594,1.37402344 C21.5234373,1.26660103 21.5009766,1.14843814
+21.5009766,1.01953125 L21.5009766,1.01953125 Z M28.1279297,7.24804688
+C28.1279297,7.15820268 28.1103517,7.07617225 28.0751953,7.00195312
+C28.0400389,6.927734 27.9736333,6.85839876 27.8759766,6.79394531
+C27.7783198,6.72949187 27.6455087,6.66796904 27.4775391,6.609375
+C27.3095695,6.55078096 27.0927748,6.4941409 26.8271484,6.43945312
+C26.5029281,6.36914027 26.2031264,6.28125053 25.9277344,6.17578125
+C25.6523424,6.07031197 25.4140635,5.93945391 25.2128906,5.78320312
+C25.0117177,5.62695234 24.8544928,5.44531354 24.7412109,5.23828125
+C24.6279291,5.03124896 24.5712891,4.79101699 24.5712891,4.51757812
+C24.5712891,4.2519518 24.6289057,4.00000119 24.7441406,3.76171875
+C24.8593756,3.52343631 25.0253895,3.31347747 25.2421875,3.13183594
+C25.4589855,2.9501944 25.7246078,2.80664115 26.0390625,2.70117188
+C26.3535172,2.5957026 26.7080058,2.54296875 27.1025391,2.54296875
+C27.5126974,2.54296875 27.8818343,2.59374949 28.2099609,2.6953125
+C28.5380876,2.79687551 28.8164051,2.93847565 29.0449219,3.12011719
+C29.2734386,3.30175872 29.4492181,3.51757688 29.5722656,3.76757812
+C29.6953131,4.01757937 29.7568359,4.29101414 29.7568359,4.58789062
+L28.0634766,4.58789062 C28.0634766,4.34570191 27.9853523,4.1455086
+27.8291016,3.98730469 C27.6728508,3.82910077 27.4287126,3.75 27.0966797,3.75
+C26.811522,3.75 26.5908211,3.81445248 26.4345703,3.94335938
+C26.2783195,4.07226627 26.2001953,4.23632713 26.2001953,4.43554688
+C26.2001953,4.52929734 26.2207029,4.61230433 26.2617188,4.68457031
+C26.3027346,4.7568363 26.3691402,4.82324188 26.4609375,4.88378906
+C26.5527348,4.94433624 26.6738274,4.99999975 26.8242188,5.05078125
+C26.9746101,5.10156275 27.1591786,5.14843729 27.3779297,5.19140625
+C27.7216814,5.25781283 28.0400376,5.33984326 28.3330078,5.4375
+C28.625978,5.53515674 28.8789052,5.66113204 29.0917969,5.81542969
+C29.3046886,5.96972733 29.4716791,6.15722546 29.5927734,6.37792969
+C29.7138678,6.59863392 29.7744141,6.86523281 29.7744141,7.17773438
+C29.7744141,7.45898578 29.7119147,7.71777226 29.5869141,7.95410156
+C29.4619134,8.19043087 29.2832043,8.39453039 29.0507812,8.56640625
+C28.8183582,8.73828211 28.5380876,8.87304639 28.2099609,8.97070312
+C27.8818343,9.06835986 27.5146505,9.1171875 27.1083984,9.1171875
+C26.6630837,9.1171875 26.2705095,9.05468812 25.9306641,8.9296875
+C25.5908186,8.80468688 25.3046887,8.64062602 25.0722656,8.4375
+C24.8398426,8.23437398 24.6650396,8.00586064 24.5478516,7.75195312
+C24.4306635,7.49804561 24.3720703,7.24218879 24.3720703,6.984375
+L25.9775391,6.984375 C25.9853516,7.14843832 26.0214841,7.29003847
+26.0859375,7.40917969 C26.1503909,7.52832091 26.235351,7.62499963
+26.3408203,7.69921875 C26.4462896,7.77343787 26.5683587,7.82812482
+26.7070312,7.86328125 C26.8457038,7.89843768 26.9912102,7.91601562
+27.1435547,7.91601562 C27.4677751,7.91601562 27.7128898,7.8544928
+27.8789062,7.73144531 C28.0449227,7.60839782 28.1279297,7.44726662
+28.1279297,7.24804688 L28.1279297,7.24804688 Z M32.8916016,1.1015625
+L32.8916016,2.66015625 L33.9755859,2.66015625 L33.9755859,3.90234375
+L32.8916016,3.90234375 L32.8916016,7.06640625 C32.8916016,7.19921941
+32.9052733,7.30859332 32.9326172,7.39453125 C32.9599611,7.48046918
+33.0009763,7.54785132 33.0556641,7.59667969 C33.1103518,7.64550806
+33.177734,7.67871085 33.2578125,7.69628906 C33.337891,7.71386728
+33.4326166,7.72265625 33.5419922,7.72265625 C33.6435552,7.72265625
+33.7363277,7.71875004 33.8203125,7.7109375 C33.9042973,7.70312496
+33.9775388,7.69335943 34.0400391,7.68164062 L34.0400391,8.96484375
+C33.8994134,9.00781271 33.7460946,9.04394517 33.5800781,9.07324219
+C33.4140617,9.10253921 33.225587,9.1171875 33.0146484,9.1171875
+C32.7373033,9.1171875 32.4873058,9.08300815 32.2646484,9.01464844
+C32.0419911,8.94628872 31.8515633,8.83789137 31.6933594,8.68945312
+C31.5351555,8.54101488 31.4130864,8.34765744 31.3271484,8.109375
+C31.2412105,7.87109256 31.1982422,7.58398605 31.1982422,7.24804688
+L31.1982422,3.90234375 L30.2724609,3.90234375 L30.2724609,2.66015625
+L31.1982422,2.66015625 L31.1982422,1.1015625 L32.8916016,1.1015625 Z
+M37.8369141,9.1171875 C37.3447241,9.1171875 36.9042988,9.03711018
+36.515625,8.87695312 C36.1269512,8.71679607 35.7968764,8.49804826
+35.5253906,8.22070312 C35.2539049,7.94335799 35.0468757,7.61816593
+34.9042969,7.24511719 C34.761718,6.87206845 34.6904297,6.47265838
+34.6904297,6.046875 L34.6904297,5.81835938 C34.6904297,5.33788822
+34.7597649,4.89746294 34.8984375,4.49707031 C35.0371101,4.09667769
+35.2343737,3.75195457 35.4902344,3.46289062 C35.746095,3.17382668
+36.0566388,2.948243 36.421875,2.78613281 C36.7871112,2.62402263
+37.1962868,2.54296875 37.6494141,2.54296875 C38.1064476,2.54296875
+38.5087873,2.61816331 38.8564453,2.76855469 C39.2041033,2.91894606
+39.4960926,3.12988146 39.7324219,3.40136719 C39.9687512,3.67285292
+40.1464838,3.99999809 40.265625,4.3828125 C40.3847662,4.76562691
+40.4443359,5.19140391 40.4443359,5.66015625 L40.4443359,6.38085938
+L36.4072266,6.38085938 C36.4345704,6.58789166 36.490234,6.77538979
+36.5742188,6.94335938 C36.6582035,7.11132896 36.7656243,7.25488222
+36.8964844,7.37402344 C37.0273444,7.49316466 37.1806632,7.58593717
+37.3564453,7.65234375 C37.5322274,7.71875033 37.7294911,7.75195312
+37.9482422,7.75195312 C38.2568375,7.75195312 38.5419909,7.69433651
+38.8037109,7.57910156 C39.065431,7.46386661 39.2900381,7.28515746
+39.4775391,7.04296875 L40.3095703,7.97460938 C40.2080073,8.11914135
+40.0810554,8.25976494 39.9287109,8.39648438 C39.7763664,8.53320381
+39.5966807,8.6552729 39.3896484,8.76269531 C39.1826162,8.87011772
+38.94922,8.95605437 38.6894531,9.02050781 C38.4296862,9.08496126
+38.1455094,9.1171875 37.8369141,9.1171875 L37.8369141,9.1171875 Z
+M37.6435547,3.9140625 C37.45996,3.9140625 37.2988288,3.94628874
+37.1601562,4.01074219 C37.0214837,4.07519563 36.9023442,4.16503849
+36.8027344,4.28027344 C36.7031245,4.39550839 36.6220706,4.53320232
+36.5595703,4.69335938 C36.49707,4.85351643 36.4521486,5.03124902
+36.4248047,5.2265625 L38.7802734,5.2265625 L38.7802734,5.09179688
+C38.7763672,4.92382729 38.7519533,4.76757885 38.7070312,4.62304688
+C38.6621092,4.4785149 38.5937505,4.35351615 38.5019531,4.24804688
+C38.4101558,4.1425776 38.2929695,4.06054717 38.1503906,4.00195312
+C38.0078118,3.94335908 37.8388682,3.9140625 37.6435547,3.9140625
+L37.6435547,3.9140625 Z M44.9677734,4.24804688 C44.8818355,4.23632807
+44.7812506,4.22558599 44.6660156,4.21582031 C44.5507807,4.20605464
+44.4482426,4.20117188 44.3583984,4.20117188 C44.0263655,4.20117188
+43.7578135,4.25683538 43.5527344,4.36816406 C43.3476552,4.47949274
+43.1962896,4.64062395 43.0986328,4.8515625 L43.0986328,9 L41.4052734,9
+L41.4052734,2.66015625 L43.0048828,2.66015625 L43.0517578,3.41601562
+C43.2119149,3.14257676 43.4091785,2.92871171 43.6435547,2.77441406
+C43.8779309,2.62011642 44.1513656,2.54296875 44.4638672,2.54296875
+C44.5537114,2.54296875 44.648437,2.55078117 44.7480469,2.56640625
+C44.8476567,2.58203133 44.9287106,2.59960928 44.9912109,2.61914062
+L44.9677734,4.24804688 Z M23.6074219,23 C23.5292965,22.8476555
+23.4726564,22.6582043 23.4375,22.4316406 C23.2656241,22.6230478
+23.049806,22.7851556 22.7900391,22.9179688 C22.5302721,23.0507819
+22.2128925,23.1171875 21.8378906,23.1171875 C21.5332016,23.1171875
+21.2490248,23.070313 20.9853516,22.9765625 C20.7216784,22.882812
+20.493165,22.751954 20.2998047,22.5839844 C20.1064443,22.4160148
+19.9550787,22.2158215 19.8457031,21.9833984 C19.7363276,21.7509754
+19.6816406,21.4960951 19.6816406,21.21875 C19.6816406,20.8867171
+19.7431634,20.5917982 19.8662109,20.3339844 C19.9892584,20.0761706
+20.1738269,19.8574228 20.4199219,19.6777344 C20.6660169,19.498046
+20.9716779,19.3613286 21.3369141,19.2675781 C21.7021503,19.1738277
+22.1269507,19.1269531 22.6113281,19.1269531 L23.3671875,19.1269531
+L23.3671875,18.7636719 C23.3671875,18.4707017 23.2919929,18.236329
+23.1416016,18.0605469 C22.9912102,17.8847647 22.7539079,17.796875
+22.4296875,17.796875 C22.1445298,17.796875 21.9208992,17.8652337
+21.7587891,18.0019531 C21.5966789,18.1386726 21.515625,18.3261707
+21.515625,18.5644531 L19.8222656,18.5644531 C19.8222656,18.2910143
+19.8857416,18.0312512 20.0126953,17.7851562 C20.1396491,17.5390613
+20.3203113,17.3242197 20.5546875,17.140625 C20.7890637,16.9570303
+21.072264,16.811524 21.4042969,16.7041016 C21.7363298,16.5966792
+22.1074198,16.5429688 22.5175781,16.5429688 C22.8847675,16.5429688
+23.2246078,16.5898433 23.5371094,16.6835938 C23.8496109,16.7773442
+24.1191395,16.9169913 24.3457031,17.1025391 C24.5722668,17.2880869
+24.7490228,17.5205064 24.8759766,17.7998047 C25.0029303,18.079103
+25.0664062,18.404295 25.0664062,18.7753906 L25.0664062,21.4589844
+C25.0664062,21.6386728 25.0722656,21.799804 25.0839844,21.9423828
+C25.0957032,22.0849617 25.111328,22.2138666 25.1308594,22.3291016
+C25.1503907,22.4443365 25.1757811,22.5478511 25.2070312,22.6396484
+C25.2382814,22.7314458 25.2753904,22.818359 25.3183594,22.9003906 L25.3183594,23
+L23.6074219,23 Z M22.2070312,21.8222656 C22.3515632,21.8222656
+22.4853509,21.8046877 22.6083984,21.7695312 C22.7314459,21.7343748
+22.8417964,21.6884768 22.9394531,21.6318359 C23.0371099,21.575195
+23.12207,21.509766 23.1943359,21.4355469 C23.2666019,21.3613278
+23.3242185,21.2851566 23.3671875,21.2070312 L23.3671875,20.1171875
+L22.6699219,20.1171875 C22.4472645,20.1171875 22.2539071,20.1416013
+22.0898438,20.1904297 C21.9257804,20.2392581 21.7910162,20.3076167
+21.6855469,20.3955078 C21.5800776,20.4833989 21.5019534,20.5869135
+21.4511719,20.7060547 C21.4003904,20.8251959 21.375,20.9550774 21.375,21.0957031
+C21.375,21.3066417 21.449218,21.4804681 21.5976562,21.6171875
+C21.7460945,21.7539069 21.9492175,21.8222656 22.2070312,21.8222656
+L22.2070312,21.8222656 Z M11.7744141,34.8847656 L13.7080078,28.46875
+L15.6650391,28.46875 L12.6943359,37 L10.8603516,37 L7.90136719,28.46875
+L9.85253906,28.46875 L11.7744141,34.8847656 Z M15.8232422,33.7714844
+C15.8232422,33.3105446 15.8896478,32.8828145 16.0224609,32.4882812
+C16.1552741,32.093748 16.3486315,31.7529311 16.6025391,31.4658203
+C16.8564466,31.1787095 17.16992,30.9531258 17.5429688,30.7890625
+C17.9160175,30.6249992 18.3408179,30.5429688 18.8173828,30.5429688
+C19.297854,30.5429688 19.7255841,30.6249992 20.1005859,30.7890625
+C20.4755878,30.9531258 20.7910143,31.1787095 21.046875,31.4658203
+C21.3027357,31.7529311 21.4970696,32.093748 21.6298828,32.4882812
+C21.762696,32.8828145 21.8291016,33.3105446 21.8291016,33.7714844
+L21.8291016,33.8945312 C21.8291016,34.3593773 21.762696,34.788084
+21.6298828,35.1806641 C21.4970696,35.5732442 21.3027357,35.9130845
+21.046875,36.2001953 C20.7910143,36.4873061 20.4775409,36.7119133
+20.1064453,36.8740234 C19.7353497,37.0361336 19.3095727,37.1171875
+18.8291016,37.1171875 C18.3486304,37.1171875 17.9218769,37.0361336
+17.5488281,36.8740234 C17.1757794,36.7119133 16.8613294,36.4873061
+16.6054688,36.2001953 C16.3496081,35.9130845 16.1552741,35.5732442
+16.0224609,35.1806641 C15.8896478,34.788084 15.8232422,34.3593773
+15.8232422,33.8945312 L15.8232422,33.7714844 Z M17.5166016,33.8945312
+C17.5166016,34.152345 17.5400388,34.3945301 17.5869141,34.6210938
+C17.6337893,34.8476574 17.7089839,35.0439445 17.8125,35.2099609
+C17.9160161,35.3759774 18.0507804,35.507812 18.2167969,35.6054688
+C18.3828133,35.7031255 18.5869129,35.7519531 18.8291016,35.7519531
+C19.0634777,35.7519531 19.263671,35.7031255 19.4296875,35.6054688
+C19.595704,35.507812 19.7314448,35.3759774 19.8369141,35.2099609
+C19.9423833,35.0439445 20.0185545,34.8476574 20.0654297,34.6210938
+C20.1123049,34.3945301 20.1357422,34.152345 20.1357422,33.8945312
+L20.1357422,33.7714844 C20.1357422,33.5214831 20.1123049,33.2841808
+20.0654297,33.0595703 C20.0185545,32.8349598 19.9423833,32.6376962
+19.8369141,32.4677734 C19.7314448,32.2978507 19.5947274,32.1630864
+19.4267578,32.0634766 C19.2587882,31.9638667 19.0556653,31.9140625
+18.8173828,31.9140625 C18.5830066,31.9140625 18.3828133,31.9638667
+18.2167969,32.0634766 C18.0507804,32.1630864 17.9160161,32.2978507
+17.8125,32.4677734 C17.7089839,32.6376962 17.6337893,32.8349598
+17.5869141,33.0595703 C17.5400388,33.2841808 17.5166016,33.5214831
+17.5166016,33.7714844 L17.5166016,33.8945312 Z M24.8994141,29.1015625
+L24.8994141,30.6601562 L25.9833984,30.6601562 L25.9833984,31.9023438
+L24.8994141,31.9023438 L24.8994141,35.0664062 C24.8994141,35.1992194
+24.9130858,35.3085933 24.9404297,35.3945312 C24.9677736,35.4804692
+25.0087888,35.5478513 25.0634766,35.5966797 C25.1181643,35.6455081
+25.1855465,35.6787108 25.265625,35.6962891 C25.3457035,35.7138673
+25.4404291,35.7226562 25.5498047,35.7226562 C25.6513677,35.7226562
+25.7441402,35.71875 25.828125,35.7109375 C25.9121098,35.703125
+25.9853513,35.6933594 26.0478516,35.6816406 L26.0478516,36.9648438
+C25.9072259,37.0078127 25.7539071,37.0439452 25.5878906,37.0732422
+C25.4218742,37.1025392 25.2333995,37.1171875 25.0224609,37.1171875
+C24.7451158,37.1171875 24.4951183,37.0830082 24.2724609,37.0146484
+C24.0498036,36.9462887 23.8593758,36.8378914 23.7011719,36.6894531
+C23.542968,36.5410149 23.4208989,36.3476574 23.3349609,36.109375
+C23.249023,35.8710926 23.2060547,35.5839861 23.2060547,35.2480469
+L23.2060547,31.9023438 L22.2802734,31.9023438 L22.2802734,30.6601562
+L23.2060547,30.6601562 L23.2060547,29.1015625 L24.8994141,29.1015625 Z
+M29.8447266,37.1171875 C29.3525366,37.1171875 28.9121113,37.0371102
+28.5234375,36.8769531 C28.1347637,36.7167961 27.8046889,36.4980483
+27.5332031,36.2207031 C27.2617174,35.943358 27.0546882,35.6181659
+26.9121094,35.2451172 C26.7695305,34.8720684 26.6982422,34.4726584
+26.6982422,34.046875 L26.6982422,33.8183594 C26.6982422,33.3378882
+26.7675774,32.8974629 26.90625,32.4970703 C27.0449226,32.0966777
+27.2421862,31.7519546 27.4980469,31.4628906 C27.7539075,31.1738267
+28.0644513,30.948243 28.4296875,30.7861328 C28.7949237,30.6240226
+29.2040993,30.5429688 29.6572266,30.5429688 C30.1142601,30.5429688
+30.5165998,30.6181633 30.8642578,30.7685547 C31.2119158,30.9189461
+31.5039051,31.1298815 31.7402344,31.4013672 C31.9765637,31.6728529
+32.1542963,31.9999981 32.2734375,32.3828125 C32.3925787,32.7656269
+32.4521484,33.1914039 32.4521484,33.6601562 L32.4521484,34.3808594
+L28.4150391,34.3808594 C28.4423829,34.5878917 28.4980465,34.7753898
+28.5820312,34.9433594 C28.666016,35.111329 28.7734368,35.2548822
+28.9042969,35.3740234 C29.0351569,35.4931647 29.1884757,35.5859372
+29.3642578,35.6523438 C29.5400399,35.7187503 29.7373036,35.7519531
+29.9560547,35.7519531 C30.26465,35.7519531 30.5498034,35.6943365
+30.8115234,35.5791016 C31.0732435,35.4638666 31.2978506,35.2851575
+31.4853516,35.0429688 L32.3173828,35.9746094 C32.2158198,36.1191413
+32.0888679,36.2597649 31.9365234,36.3964844 C31.7841789,36.5332038
+31.6044932,36.6552729 31.3974609,36.7626953 C31.1904287,36.8701177
+30.9570325,36.9560544 30.6972656,37.0205078 C30.4374987,37.0849613
+30.1533219,37.1171875 29.8447266,37.1171875 L29.8447266,37.1171875 Z
+M29.6513672,31.9140625 C29.4677725,31.9140625 29.3066413,31.9462887
+29.1679688,32.0107422 C29.0292962,32.0751956 28.9101567,32.1650385
+28.8105469,32.2802734 C28.710937,32.3955084 28.6298831,32.5332023
+28.5673828,32.6933594 C28.5048825,32.8535164 28.4599611,33.031249
+28.4326172,33.2265625 L30.7880859,33.2265625 L30.7880859,33.0917969
+C30.7841797,32.9238273 30.7597658,32.7675788 30.7148438,32.6230469
+C30.6699217,32.4785149 30.601563,32.3535162 30.5097656,32.2480469
+C30.4179683,32.1425776 30.300782,32.0605472 30.1582031,32.0019531
+C30.0156243,31.9433591 29.8466807,31.9140625 29.6513672,31.9140625
+L29.6513672,31.9140625 Z M36.9755859,32.2480469 C36.889648,32.2363281
+36.7890631,32.225586 36.6738281,32.2158203 C36.5585932,32.2060546
+36.4560551,32.2011719 36.3662109,32.2011719 C36.034178,32.2011719
+35.765626,32.2568354 35.5605469,32.3681641 C35.3554677,32.4794927
+35.2041021,32.6406239 35.1064453,32.8515625 L35.1064453,37 L33.4130859,37
+L33.4130859,30.6601562 L35.0126953,30.6601562 L35.0595703,31.4160156
+C35.2197274,31.1425768 35.416991,30.9287117 35.6513672,30.7744141
+C35.8857434,30.6201164 36.1591781,30.5429688 36.4716797,30.5429688
+C36.5615239,30.5429688 36.6562495,30.5507812 36.7558594,30.5664062
+C36.8554692,30.5820313 36.9365231,30.5996093 36.9990234,30.6191406
+L36.9755859,32.2480469 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/register_to_vote.xml b/app/src/main/res/drawable/register_to_vote.xml
deleted file mode 100644
index 473ef10b..00000000
--- a/app/src/main/res/drawable/register_to_vote.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:width="45dp"
-        android:height="38dp"
-        android:viewportWidth="45"
-        android:viewportHeight="38"
-    >
-
-    <path
-        android:name="Register"
-        android:fillColor="#000000"
-        android:pathData="M3.28808594,5.87695312 L1.88769531,5.87695312 L1.88769531,9 L0.129882812,9
-L0.129882812,0.46875 L3.29980469,0.46875 C3.79199465,0.46875
-4.23339648,0.524413506 4.62402344,0.635742188 C5.01465039,0.747070869
-5.34472521,0.911131729 5.61425781,1.12792969 C5.88379041,1.34472765
-6.09081959,1.61327965 6.23535156,1.93359375 C6.37988354,2.25390785
-6.45214844,2.62499789 6.45214844,3.046875 C6.45214844,3.35937656
-6.41699254,3.6396472 6.34667969,3.88769531 C6.27636684,4.13574343
-6.17480535,4.35644435 6.04199219,4.54980469 C5.90917902,4.74316503
-5.74902438,4.91210865 5.56152344,5.05664062 C5.3740225,5.2011726
-5.16308711,5.32617135 4.92871094,5.43164062 L6.77441406,8.91796875 L6.77441406,9
-L4.88769531,9 L3.28808594,5.87695312 Z M1.88769531,4.453125 L3.30566406,4.453125
-C3.53613396,4.453125 3.73828038,4.42285187 3.91210937,4.36230469
-C4.08593837,4.30175751 4.23046817,4.21582087 4.34570312,4.10449219
-C4.46093808,3.99316351 4.54785127,3.86035233 4.60644531,3.70605469
-C4.66503936,3.55175704 4.69433594,3.37890721 4.69433594,3.1875
-C4.69433594,2.78515424 4.58007927,2.46875115 4.3515625,2.23828125
-C4.12304573,2.00781135 3.7724633,1.89257812 3.29980469,1.89257812
-L1.88769531,1.89257812 L1.88769531,4.453125 Z M10.5947266,9.1171875
-C10.1025366,9.1171875 9.66211132,9.03711018 9.2734375,8.87695312
-C8.88476368,8.71679607 8.55468886,8.49804826 8.28320312,8.22070312
-C8.01171739,7.94335799 7.80468821,7.61816593 7.66210938,7.24511719
-C7.51953054,6.87206845 7.44824219,6.47265838 7.44824219,6.046875
-L7.44824219,5.81835938 C7.44824219,5.33788822 7.51757743,4.89746294
-7.65625,4.49707031 C7.79492257,4.09667769 7.99218622,3.75195457
-8.24804688,3.46289062 C8.50390753,3.17382668 8.8144513,2.948243
-9.1796875,2.78613281 C9.5449237,2.62402263 9.9540993,2.54296875
-10.4072266,2.54296875 C10.8642601,2.54296875 11.2665998,2.61816331
-11.6142578,2.76855469 C11.9619158,2.91894606 12.2539051,3.12988146
-12.4902344,3.40136719 C12.7265637,3.67285292 12.9042963,3.99999809
-13.0234375,4.3828125 C13.1425787,4.76562691 13.2021484,5.19140391
-13.2021484,5.66015625 L13.2021484,6.38085938 L9.16503906,6.38085938
-C9.19238295,6.58789166 9.24804646,6.77538979 9.33203125,6.94335938
-C9.41601604,7.11132896 9.52343685,7.25488222 9.65429688,7.37402344
-C9.7851569,7.49316466 9.93847568,7.58593717 10.1142578,7.65234375
-C10.2900399,7.71875033 10.4873036,7.75195312 10.7060547,7.75195312
-C11.01465,7.75195312 11.2998034,7.69433651 11.5615234,7.57910156
-C11.8232435,7.46386661 12.0478506,7.28515746 12.2353516,7.04296875
-L13.0673828,7.97460938 C12.9658198,8.11914135 12.8388679,8.25976494
-12.6865234,8.39648438 C12.5341789,8.53320381 12.3544932,8.6552729
-12.1474609,8.76269531 C11.9404287,8.87011772 11.7070325,8.95605437
-11.4472656,9.02050781 C11.1874987,9.08496126 10.9033219,9.1171875
-10.5947266,9.1171875 L10.5947266,9.1171875 Z M10.4013672,3.9140625
-C10.2177725,3.9140625 10.0566413,3.94628874 9.91796875,4.01074219
-C9.77929618,4.07519563 9.66015675,4.16503849 9.56054688,4.28027344
-C9.460937,4.39550839 9.37988312,4.53320232 9.31738281,4.69335938
-C9.2548825,4.85351643 9.20996107,5.03124902 9.18261719,5.2265625
-L11.5380859,5.2265625 L11.5380859,5.09179688 C11.5341797,4.92382729
-11.5097658,4.76757885 11.4648438,4.62304688 C11.4199217,4.4785149
-11.351563,4.35351615 11.2597656,4.24804688 C11.1679683,4.1425776
-11.050782,4.06054717 10.9082031,4.00195312 C10.7656243,3.94335908
-10.5966807,3.9140625 10.4013672,3.9140625 L10.4013672,3.9140625 Z
-M13.9169922,5.78320312 C13.9169922,5.30273197 13.9765619,4.86328324
-14.0957031,4.46484375 C14.2148443,4.06640426 14.3847645,3.7246108
-14.6054688,3.43945312 C14.826173,3.15429545 15.094725,2.93359453
-15.4111328,2.77734375 C15.7275406,2.62109297 16.0849589,2.54296875
-16.4833984,2.54296875 C16.854494,2.54296875 17.1718737,2.60546812
-17.4355469,2.73046875 C17.6992201,2.85546938 17.9228506,3.03124887
-18.1064453,3.2578125 L18.1767578,2.66015625 L19.7119141,2.66015625
-L19.7119141,8.78320312 C19.7119141,9.21679904 19.6376961,9.60156082
-19.4892578,9.9375 C19.3408196,10.2734392 19.1328138,10.557616
-18.8652344,10.7900391 C18.5976549,11.0224621 18.2773456,11.1982416
-17.9042969,11.3173828 C17.5312481,11.436524 17.1181663,11.4960938
-16.6650391,11.4960938 C16.4697256,11.4960938 16.2626964,11.4765627
-16.0439453,11.4375 C15.8251942,11.3984373 15.6093761,11.337891
-15.3964844,11.2558594 C15.1835927,11.1738277 14.9814463,11.0703131
-14.7900391,10.9453125 C14.5986319,10.8203119 14.4365241,10.6718759
-14.3037109,10.5 L15.0537109,9.46875 C15.2529307,9.69140736 15.4804675,9.86523375
-15.7363281,9.99023438 C15.9921888,10.115235 16.2763656,10.1777344
-16.5888672,10.1777344 C17.0380882,10.1777344 17.3876941,10.0576184
-17.6376953,9.81738281 C17.8876966,9.57714724 18.0126953,9.23633033
-18.0126953,8.79492188 L18.0126953,8.45507812 C17.8251944,8.66601668
-17.6044935,8.82910099 17.3505859,8.94433594 C17.0966784,9.05957089
-16.8037126,9.1171875 16.4716797,9.1171875 C16.0771465,9.1171875
-15.7226578,9.03613362 15.4082031,8.87402344 C15.0937484,8.71191325
-14.826173,8.48828268 14.6054688,8.203125 C14.3847645,7.91796732
-14.2148443,7.57910353 14.0957031,7.18652344 C13.9765619,6.79394335
-13.9169922,6.3671898 13.9169922,5.90625 L13.9169922,5.78320312 Z
-M15.6103516,5.90625 C15.6103516,6.16406379 15.6357419,6.40429576
-15.6865234,6.62695312 C15.7373049,6.84961049 15.8164057,7.04394448
-15.9238281,7.20996094 C16.0312505,7.37597739 16.1660148,7.50683546
-16.328125,7.60253906 C16.4902352,7.69824267 16.6826161,7.74609375
-16.9052734,7.74609375 C17.174806,7.74609375 17.4003897,7.69531301
-17.5820312,7.59375 C17.7636728,7.49218699 17.907226,7.34961029
-18.0126953,7.16601562 L18.0126953,4.5 C17.9033198,4.31249906
-17.7597665,4.16894581 17.5820312,4.06933594 C17.404296,3.96972606
-17.1826185,3.91992188 16.9169922,3.91992188 C16.6943348,3.91992188
-16.5019539,3.96777296 16.3398438,4.06347656 C16.1777336,4.15918017
-16.0419927,4.29101479 15.9326172,4.45898438 C15.8232416,4.62695396
-15.7421878,4.82421762 15.6894531,5.05078125 C15.6367185,5.27734488
-15.6103516,5.52148307 15.6103516,5.78320312 L15.6103516,5.90625 Z M22.7998047,9
-L21.1005859,9 L21.1005859,2.66015625 L22.7998047,2.66015625 L22.7998047,9 Z
-M21.0009766,1.01953125 C21.0009766,0.76562373 21.0859367,0.556641445
-21.2558594,0.392578125 C21.4257821,0.228514805 21.6572251,0.146484375
-21.9501953,0.146484375 C22.0947273,0.146484375 22.2255854,0.167968535
-22.3427734,0.2109375 C22.4599615,0.253906465 22.5595699,0.314452734
-22.6416016,0.392578125 C22.7236332,0.470703516 22.7871092,0.563476025
-22.8320312,0.670898438 C22.8769533,0.77832085 22.8994141,0.894530625
-22.8994141,1.01953125 C22.8994141,1.14843814 22.8769533,1.26660103
-22.8320312,1.37402344 C22.7871092,1.48144585 22.7236332,1.57421836
-22.6416016,1.65234375 C22.5595699,1.73046914 22.4599615,1.79101541
-22.3427734,1.83398438 C22.2255854,1.87695334 22.0947273,1.8984375
-21.9501953,1.8984375 C21.8056633,1.8984375 21.6748053,1.87695334
-21.5576172,1.83398438 C21.4404291,1.79101541 21.3408207,1.73046914
-21.2587891,1.65234375 C21.1767574,1.57421836 21.1132815,1.48144585
-21.0683594,1.37402344 C21.0234373,1.26660103 21.0009766,1.14843814
-21.0009766,1.01953125 L21.0009766,1.01953125 Z M27.6279297,7.24804688
-C27.6279297,7.15820268 27.6103517,7.07617225 27.5751953,7.00195312
-C27.5400389,6.927734 27.4736333,6.85839876 27.3759766,6.79394531
-C27.2783198,6.72949187 27.1455087,6.66796904 26.9775391,6.609375
-C26.8095695,6.55078096 26.5927748,6.4941409 26.3271484,6.43945312
-C26.0029281,6.36914027 25.7031264,6.28125053 25.4277344,6.17578125
-C25.1523424,6.07031197 24.9140635,5.93945391 24.7128906,5.78320312
-C24.5117177,5.62695234 24.3544928,5.44531354 24.2412109,5.23828125
-C24.1279291,5.03124896 24.0712891,4.79101699 24.0712891,4.51757812
-C24.0712891,4.2519518 24.1289057,4.00000119 24.2441406,3.76171875
-C24.3593756,3.52343631 24.5253895,3.31347747 24.7421875,3.13183594
-C24.9589855,2.9501944 25.2246078,2.80664115 25.5390625,2.70117188
-C25.8535172,2.5957026 26.2080058,2.54296875 26.6025391,2.54296875
-C27.0126974,2.54296875 27.3818343,2.59374949 27.7099609,2.6953125
-C28.0380876,2.79687551 28.3164051,2.93847565 28.5449219,3.12011719
-C28.7734386,3.30175872 28.9492181,3.51757688 29.0722656,3.76757812
-C29.1953131,4.01757937 29.2568359,4.29101414 29.2568359,4.58789062
-L27.5634766,4.58789062 C27.5634766,4.34570191 27.4853523,4.1455086
-27.3291016,3.98730469 C27.1728508,3.82910077 26.9287126,3.75 26.5966797,3.75
-C26.311522,3.75 26.0908211,3.81445248 25.9345703,3.94335938
-C25.7783195,4.07226627 25.7001953,4.23632713 25.7001953,4.43554688
-C25.7001953,4.52929734 25.7207029,4.61230433 25.7617188,4.68457031
-C25.8027346,4.7568363 25.8691402,4.82324188 25.9609375,4.88378906
-C26.0527348,4.94433624 26.1738274,4.99999975 26.3242188,5.05078125
-C26.4746101,5.10156275 26.6591786,5.14843729 26.8779297,5.19140625
-C27.2216814,5.25781283 27.5400376,5.33984326 27.8330078,5.4375
-C28.125978,5.53515674 28.3789052,5.66113204 28.5917969,5.81542969
-C28.8046886,5.96972733 28.9716791,6.15722546 29.0927734,6.37792969
-C29.2138678,6.59863392 29.2744141,6.86523281 29.2744141,7.17773438
-C29.2744141,7.45898578 29.2119147,7.71777226 29.0869141,7.95410156
-C28.9619134,8.19043087 28.7832043,8.39453039 28.5507812,8.56640625
-C28.3183582,8.73828211 28.0380876,8.87304639 27.7099609,8.97070312
-C27.3818343,9.06835986 27.0146505,9.1171875 26.6083984,9.1171875
-C26.1630837,9.1171875 25.7705095,9.05468813 25.4306641,8.9296875
-C25.0908186,8.80468687 24.8046887,8.64062602 24.5722656,8.4375
-C24.3398426,8.23437398 24.1650396,8.00586064 24.0478516,7.75195312
-C23.9306635,7.49804561 23.8720703,7.24218879 23.8720703,6.984375
-L25.4775391,6.984375 C25.4853516,7.14843832 25.5214841,7.29003847
-25.5859375,7.40917969 C25.6503909,7.52832091 25.735351,7.62499963
-25.8408203,7.69921875 C25.9462896,7.77343787 26.0683587,7.82812482
-26.2070312,7.86328125 C26.3457038,7.89843768 26.4912102,7.91601562
-26.6435547,7.91601562 C26.9677751,7.91601562 27.2128898,7.8544928
-27.3789062,7.73144531 C27.5449227,7.60839782 27.6279297,7.44726662
-27.6279297,7.24804688 L27.6279297,7.24804688 Z M32.3916016,1.1015625
-L32.3916016,2.66015625 L33.4755859,2.66015625 L33.4755859,3.90234375
-L32.3916016,3.90234375 L32.3916016,7.06640625 C32.3916016,7.19921941
-32.4052733,7.30859332 32.4326172,7.39453125 C32.4599611,7.48046918
-32.5009763,7.54785132 32.5556641,7.59667969 C32.6103518,7.64550806
-32.677734,7.67871085 32.7578125,7.69628906 C32.837891,7.71386728
-32.9326166,7.72265625 33.0419922,7.72265625 C33.1435552,7.72265625
-33.2363277,7.71875004 33.3203125,7.7109375 C33.4042973,7.70312496
-33.4775388,7.69335943 33.5400391,7.68164062 L33.5400391,8.96484375
-C33.3994134,9.00781271 33.2460946,9.04394517 33.0800781,9.07324219
-C32.9140617,9.10253921 32.725587,9.1171875 32.5146484,9.1171875
-C32.2373033,9.1171875 31.9873058,9.08300815 31.7646484,9.01464844
-C31.5419911,8.94628872 31.3515633,8.83789137 31.1933594,8.68945312
-C31.0351555,8.54101488 30.9130864,8.34765744 30.8271484,8.109375
-C30.7412105,7.87109256 30.6982422,7.58398605 30.6982422,7.24804688
-L30.6982422,3.90234375 L29.7724609,3.90234375 L29.7724609,2.66015625
-L30.6982422,2.66015625 L30.6982422,1.1015625 L32.3916016,1.1015625 Z
-M37.3369141,9.1171875 C36.8447241,9.1171875 36.4042988,9.03711018
-36.015625,8.87695312 C35.6269512,8.71679607 35.2968764,8.49804826
-35.0253906,8.22070312 C34.7539049,7.94335799 34.5468757,7.61816593
-34.4042969,7.24511719 C34.261718,6.87206845 34.1904297,6.47265838
-34.1904297,6.046875 L34.1904297,5.81835938 C34.1904297,5.33788822
-34.2597649,4.89746294 34.3984375,4.49707031 C34.5371101,4.09667769
-34.7343737,3.75195457 34.9902344,3.46289062 C35.246095,3.17382668
-35.5566388,2.948243 35.921875,2.78613281 C36.2871112,2.62402263
-36.6962868,2.54296875 37.1494141,2.54296875 C37.6064476,2.54296875
-38.0087873,2.61816331 38.3564453,2.76855469 C38.7041033,2.91894606
-38.9960926,3.12988146 39.2324219,3.40136719 C39.4687512,3.67285292
-39.6464838,3.99999809 39.765625,4.3828125 C39.8847662,4.76562691
-39.9443359,5.19140391 39.9443359,5.66015625 L39.9443359,6.38085938
-L35.9072266,6.38085938 C35.9345704,6.58789166 35.990234,6.77538979
-36.0742188,6.94335938 C36.1582035,7.11132896 36.2656243,7.25488222
-36.3964844,7.37402344 C36.5273444,7.49316466 36.6806632,7.58593717
-36.8564453,7.65234375 C37.0322274,7.71875033 37.2294911,7.75195312
-37.4482422,7.75195312 C37.7568375,7.75195312 38.0419909,7.69433651
-38.3037109,7.57910156 C38.565431,7.46386661 38.7900381,7.28515746
-38.9775391,7.04296875 L39.8095703,7.97460938 C39.7080073,8.11914135
-39.5810554,8.25976494 39.4287109,8.39648438 C39.2763664,8.53320381
-39.0966807,8.6552729 38.8896484,8.76269531 C38.6826162,8.87011772
-38.44922,8.95605437 38.1894531,9.02050781 C37.9296862,9.08496126
-37.6455094,9.1171875 37.3369141,9.1171875 L37.3369141,9.1171875 Z
-M37.1435547,3.9140625 C36.95996,3.9140625 36.7988288,3.94628874
-36.6601562,4.01074219 C36.5214837,4.07519563 36.4023442,4.16503849
-36.3027344,4.28027344 C36.2031245,4.39550839 36.1220706,4.53320232
-36.0595703,4.69335938 C35.99707,4.85351643 35.9521486,5.03124902
-35.9248047,5.2265625 L38.2802734,5.2265625 L38.2802734,5.09179688
-C38.2763672,4.92382729 38.2519533,4.76757885 38.2070312,4.62304688
-C38.1621092,4.4785149 38.0937505,4.35351615 38.0019531,4.24804688
-C37.9101558,4.1425776 37.7929695,4.06054717 37.6503906,4.00195312
-C37.5078118,3.94335908 37.3388682,3.9140625 37.1435547,3.9140625
-L37.1435547,3.9140625 Z M44.4677734,4.24804688 C44.3818355,4.23632807
-44.2812506,4.22558599 44.1660156,4.21582031 C44.0507807,4.20605464
-43.9482426,4.20117188 43.8583984,4.20117188 C43.5263655,4.20117188
-43.2578135,4.25683538 43.0527344,4.36816406 C42.8476552,4.47949274
-42.6962896,4.64062395 42.5986328,4.8515625 L42.5986328,9 L40.9052734,9
-L40.9052734,2.66015625 L42.5048828,2.66015625 L42.5517578,3.41601562
-C42.7119149,3.14257676 42.9091785,2.92871171 43.1435547,2.77441406
-C43.3779309,2.62011642 43.6513656,2.54296875 43.9638672,2.54296875
-C44.0537114,2.54296875 44.148437,2.55078117 44.2480469,2.56640625
-C44.3476567,2.58203133 44.4287106,2.59960928 44.4912109,2.61914062
-L44.4677734,4.24804688 Z" />
-    <path
-        android:name="to"
-        android:fillColor="#000000"
-        android:pathData="M19.8457031,15.1015625 L19.8457031,16.6601562 L20.9296875,16.6601562
-L20.9296875,17.9023438 L19.8457031,17.9023438 L19.8457031,21.0664062
-C19.8457031,21.1992194 19.8593749,21.3085933 19.8867188,21.3945312
-C19.9140626,21.4804692 19.9550779,21.5478513 20.0097656,21.5966797
-C20.0644534,21.6455081 20.1318355,21.6787108 20.2119141,21.6962891
-C20.2919926,21.7138673 20.3867182,21.7226562 20.4960938,21.7226562
-C20.5976568,21.7226562 20.6904293,21.71875 20.7744141,21.7109375
-C20.8583989,21.703125 20.9316403,21.6933594 20.9941406,21.6816406
-L20.9941406,22.9648438 C20.8535149,23.0078127 20.7001961,23.0439452
-20.5341797,23.0732422 C20.3681632,23.1025392 20.1796886,23.1171875
-19.96875,23.1171875 C19.6914049,23.1171875 19.4414074,23.0830082
-19.21875,23.0146484 C18.9960926,22.9462887 18.8056649,22.8378914
-18.6474609,22.6894531 C18.489257,22.5410149 18.3671879,22.3476574
-18.28125,22.109375 C18.1953121,21.8710926 18.1523438,21.5839861
-18.1523438,21.2480469 L18.1523438,17.9023438 L17.2265625,17.9023438
-L17.2265625,16.6601562 L18.1523438,16.6601562 L18.1523438,15.1015625
-L19.8457031,15.1015625 Z M21.4335938,19.7714844 C21.4335938,19.3105446
-21.4999993,18.8828145 21.6328125,18.4882812 C21.7656257,18.093748
-21.9589831,17.7529311 22.2128906,17.4658203 C22.4667981,17.1787095
-22.7802716,16.9531258 23.1533203,16.7890625 C23.5263691,16.6249992
-23.9511695,16.5429688 24.4277344,16.5429688 C24.9082055,16.5429688
-25.3359356,16.6249992 25.7109375,16.7890625 C26.0859394,16.9531258
-26.4013659,17.1787095 26.6572266,17.4658203 C26.9130872,17.7529311
-27.1074212,18.093748 27.2402344,18.4882812 C27.3730475,18.8828145
-27.4394531,19.3105446 27.4394531,19.7714844 L27.4394531,19.8945312
-C27.4394531,20.3593773 27.3730475,20.788084 27.2402344,21.1806641
-C27.1074212,21.5732442 26.9130872,21.9130845 26.6572266,22.2001953
-C26.4013659,22.4873061 26.0878925,22.7119133 25.7167969,22.8740234
-C25.3457013,23.0361336 24.9199243,23.1171875 24.4394531,23.1171875
-C23.958982,23.1171875 23.5322284,23.0361336 23.1591797,22.8740234
-C22.7861309,22.7119133 22.471681,22.4873061 22.2158203,22.2001953
-C21.9599597,21.9130845 21.7656257,21.5732442 21.6328125,21.1806641
-C21.4999993,20.788084 21.4335938,20.3593773 21.4335938,19.8945312
-L21.4335938,19.7714844 Z M23.1269531,19.8945312 C23.1269531,20.152345
-23.1503904,20.3945301 23.1972656,20.6210938 C23.2441409,20.8476574
-23.3193354,21.0439445 23.4228516,21.2099609 C23.5263677,21.3759774
-23.661132,21.507812 23.8271484,21.6054688 C23.9931649,21.7031255
-24.1972644,21.7519531 24.4394531,21.7519531 C24.6738293,21.7519531
-24.8740226,21.7031255 25.0400391,21.6054688 C25.2060555,21.507812
-25.3417963,21.3759774 25.4472656,21.2099609 C25.5527349,21.0439445
-25.628906,20.8476574 25.6757812,20.6210938 C25.7226565,20.3945301
-25.7460938,20.152345 25.7460938,19.8945312 L25.7460938,19.7714844
-C25.7460938,19.5214831 25.7226565,19.2841808 25.6757812,19.0595703
-C25.628906,18.8349598 25.5527349,18.6376962 25.4472656,18.4677734
-C25.3417963,18.2978507 25.205079,18.1630864 25.0371094,18.0634766
-C24.8691398,17.9638667 24.6660168,17.9140625 24.4277344,17.9140625
-C24.1933582,17.9140625 23.9931649,17.9638667 23.8271484,18.0634766
-C23.661132,18.1630864 23.5263677,18.2978507 23.4228516,18.4677734
-C23.3193354,18.6376962 23.2441409,18.8349598 23.1972656,19.0595703
-C23.1503904,19.2841808 23.1269531,19.5214831 23.1269531,19.7714844
-L23.1269531,19.8945312 Z" />
-    <path
-        android:name="Vote"
-        android:fillColor="#000000"
-        android:pathData="M13.9628906,34.8847656 L15.8964844,28.46875 L17.8535156,28.46875 L14.8828125,37
-L13.0488281,37 L10.0898438,28.46875 L12.0410156,28.46875 L13.9628906,34.8847656
-Z M18.0117188,33.7714844 C18.0117188,33.3105446 18.0781243,32.8828145
-18.2109375,32.4882812 C18.3437507,32.093748 18.5371081,31.7529311
-18.7910156,31.4658203 C19.0449231,31.1787095 19.3583966,30.9531258
-19.7314453,30.7890625 C20.1044941,30.6249992 20.5292945,30.5429688
-21.0058594,30.5429688 C21.4863305,30.5429688 21.9140606,30.6249992
-22.2890625,30.7890625 C22.6640644,30.9531258 22.9794909,31.1787095
-23.2353516,31.4658203 C23.4912122,31.7529311 23.6855462,32.093748
-23.8183594,32.4882812 C23.9511725,32.8828145 24.0175781,33.3105446
-24.0175781,33.7714844 L24.0175781,33.8945312 C24.0175781,34.3593773
-23.9511725,34.788084 23.8183594,35.1806641 C23.6855462,35.5732442
-23.4912122,35.9130845 23.2353516,36.2001953 C22.9794909,36.4873061
-22.6660175,36.7119133 22.2949219,36.8740234 C21.9238263,37.0361336
-21.4980493,37.1171875 21.0175781,37.1171875 C20.537107,37.1171875
-20.1103534,37.0361336 19.7373047,36.8740234 C19.3642559,36.7119133
-19.049806,36.4873061 18.7939453,36.2001953 C18.5380847,35.9130845
-18.3437507,35.5732442 18.2109375,35.1806641 C18.0781243,34.788084
-18.0117188,34.3593773 18.0117188,33.8945312 L18.0117188,33.7714844 Z
-M19.7050781,33.8945312 C19.7050781,34.152345 19.7285154,34.3945301
-19.7753906,34.6210938 C19.8222659,34.8476574 19.8974604,35.0439445
-20.0009766,35.2099609 C20.1044927,35.3759774 20.239257,35.507812
-20.4052734,35.6054688 C20.5712899,35.7031255 20.7753894,35.7519531
-21.0175781,35.7519531 C21.2519543,35.7519531 21.4521476,35.7031255
-21.6181641,35.6054688 C21.7841805,35.507812 21.9199213,35.3759774
-22.0253906,35.2099609 C22.1308599,35.0439445 22.207031,34.8476574
-22.2539062,34.6210938 C22.3007815,34.3945301 22.3242188,34.152345
-22.3242188,33.8945312 L22.3242188,33.7714844 C22.3242188,33.5214831
-22.3007815,33.2841808 22.2539062,33.0595703 C22.207031,32.8349598
-22.1308599,32.6376962 22.0253906,32.4677734 C21.9199213,32.2978507
-21.783204,32.1630864 21.6152344,32.0634766 C21.4472648,31.9638667
-21.2441418,31.9140625 21.0058594,31.9140625 C20.7714832,31.9140625
-20.5712899,31.9638667 20.4052734,32.0634766 C20.239257,32.1630864
-20.1044927,32.2978507 20.0009766,32.4677734 C19.8974604,32.6376962
-19.8222659,32.8349598 19.7753906,33.0595703 C19.7285154,33.2841808
-19.7050781,33.5214831 19.7050781,33.7714844 L19.7050781,33.8945312 Z
-M27.0878906,29.1015625 L27.0878906,30.6601562 L28.171875,30.6601562
-L28.171875,31.9023438 L27.0878906,31.9023438 L27.0878906,35.0664062
-C27.0878906,35.1992194 27.1015624,35.3085933 27.1289062,35.3945312
-C27.1562501,35.4804692 27.1972654,35.5478513 27.2519531,35.5966797
-C27.3066409,35.6455081 27.374023,35.6787108 27.4541016,35.6962891
-C27.5341801,35.7138673 27.6289057,35.7226562 27.7382812,35.7226562
-C27.8398443,35.7226562 27.9326168,35.71875 28.0166016,35.7109375
-C28.1005864,35.703125 28.1738278,35.6933594 28.2363281,35.6816406
-L28.2363281,36.9648438 C28.0957024,37.0078127 27.9423836,37.0439452
-27.7763672,37.0732422 C27.6103507,37.1025392 27.4218761,37.1171875
-27.2109375,37.1171875 C26.9335924,37.1171875 26.6835949,37.0830082
-26.4609375,37.0146484 C26.2382801,36.9462887 26.0478524,36.8378914
-25.8896484,36.6894531 C25.7314445,36.5410149 25.6093754,36.3476574
-25.5234375,36.109375 C25.4374996,35.8710926 25.3945312,35.5839861
-25.3945312,35.2480469 L25.3945312,31.9023438 L24.46875,31.9023438
-L24.46875,30.6601562 L25.3945312,30.6601562 L25.3945312,29.1015625
-L27.0878906,29.1015625 Z M32.0332031,37.1171875 C31.5410132,37.1171875
-31.1005879,37.0371102 30.7119141,36.8769531 C30.3232402,36.7167961
-29.9931654,36.4980483 29.7216797,36.2207031 C29.450194,35.943358
-29.2431648,35.6181659 29.1005859,35.2451172 C28.9580071,34.8720684
-28.8867188,34.4726584 28.8867188,34.046875 L28.8867188,33.8183594
-C28.8867188,33.3378882 28.956054,32.8974629 29.0947266,32.4970703
-C29.2333991,32.0966777 29.4306628,31.7519546 29.6865234,31.4628906
-C29.9423841,31.1738267 30.2529279,30.948243 30.6181641,30.7861328
-C30.9834003,30.6240226 31.3925759,30.5429688 31.8457031,30.5429688
-C32.3027367,30.5429688 32.7050764,30.6181633 33.0527344,30.7685547
-C33.4003924,30.9189461 33.6923816,31.1298815 33.9287109,31.4013672
-C34.1650402,31.6728529 34.3427728,31.9999981 34.4619141,32.3828125
-C34.5810553,32.7656269 34.640625,33.1914039 34.640625,33.6601562
-L34.640625,34.3808594 L30.6035156,34.3808594 C30.6308595,34.5878917
-30.686523,34.7753898 30.7705078,34.9433594 C30.8544926,35.111329
-30.9619134,35.2548822 31.0927734,35.3740234 C31.2236335,35.4931647
-31.3769522,35.5859372 31.5527344,35.6523438 C31.7285165,35.7187503
-31.9257802,35.7519531 32.1445312,35.7519531 C32.4531265,35.7519531
-32.7382799,35.6943365 33,35.5791016 C33.2617201,35.4638666 33.4863272,35.2851575
-33.6738281,35.0429688 L34.5058594,35.9746094 C34.4042964,36.1191413
-34.2773445,36.2597649 34.125,36.3964844 C33.9726555,36.5332038
-33.7929698,36.6552729 33.5859375,36.7626953 C33.3789052,36.8701177
-33.1455091,36.9560544 32.8857422,37.0205078 C32.6259753,37.0849613
-32.3417984,37.1171875 32.0332031,37.1171875 L32.0332031,37.1171875 Z
-M31.8398438,31.9140625 C31.6562491,31.9140625 31.4951179,31.9462887
-31.3564453,32.0107422 C31.2177727,32.0751956 31.0986333,32.1650385
-30.9990234,32.2802734 C30.8994136,32.3955084 30.8183597,32.5332023
-30.7558594,32.6933594 C30.6933591,32.8535164 30.6484376,33.031249
-30.6210938,33.2265625 L32.9765625,33.2265625 L32.9765625,33.0917969
-C32.9726562,32.9238273 32.9482424,32.7675788 32.9033203,32.6230469
-C32.8583982,32.4785149 32.7900395,32.3535162 32.6982422,32.2480469
-C32.6064449,32.1425776 32.4892585,32.0605472 32.3466797,32.0019531
-C32.2041008,31.9433591 32.0351572,31.9140625 31.8398438,31.9140625
-L31.8398438,31.9140625 Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fa595c1a..81a3aae5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,7 +1,6 @@
 <android.support.design.widget.CoordinatorLayout
     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"
     android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -71,47 +70,6 @@
             android:layout_marginStart="@dimen/content_margin"
             android:background="@drawable/rounded_bottom"
             android:elevation="2dp"/>
-
-        <LinearLayout
-            android:id="@+id/total_registered_grid"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="120dp"
-            android:orientation="horizontal"
-            >
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight=".65"
-                android:layout_gravity="fill_horizontal"
-                android:layout_marginBottom="@dimen/content_area_padding"
-                android:layout_marginStart="@dimen/content_margin"
-                android:layout_marginTop="@dimen/content_area_padding"
-                android:fontFamily="sans-serif-light"
-                android:paddingBottom="@dimen/content_area_padding"
-                android:paddingStart="@dimen/content_area_padding"
-                android:text="@string/label_total_registered"
-                android:textAppearance="@android:style/TextAppearance.Material.Display1"
-                android:textColor="@color/colorSecondaryText"/>
-
-            <TextView
-                android:id="@+id/total_registered"
-                android:layout_height="wrap_content"
-                android:layout_width="0dp"
-                android:layout_weight=".35"
-                android:layout_gravity="fill_horizontal"
-                android:layout_marginBottom="@dimen/content_area_padding"
-                android:layout_marginEnd="@dimen/content_margin"
-                android:layout_marginTop="@dimen/content_area_padding"
-                android:fontFamily="sans-serif-condensed"
-                android:gravity="end"
-                android:paddingEnd="@dimen/content_area_padding"
-                android:textAppearance="@android:style/TextAppearance.Material.Display1"
-                android:textColor="@color/colorPrimaryDark"
-                tools:text="100"/>
-
-        </LinearLayout>
     </LinearLayout>
 
     <android.support.design.widget.FloatingActionButton
@@ -121,7 +79,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginBottom="@dimen/content_margin"
         android:layout_marginEnd="@dimen/content_margin"
-        android:src="@drawable/register_to_vote"
+        android:src="@drawable/register_a_voter"
         android:scaleType="centerInside"
         android:tint="@android:color/white"
         app:elevation="4dp"
diff --git a/app/src/main/res/layout/fragment_additional_info.xml b/app/src/main/res/layout/fragment_additional_info.xml
index db34f929..2e9f53d8 100644
--- a/app/src/main/res/layout/fragment_additional_info.xml
+++ b/app/src/main/res/layout/fragment_additional_info.xml
@@ -40,6 +40,7 @@
             android:layout_height="wrap_content"
             android:hint="@string/preferred_language_label"
             android:inputType="text"
+            android:maxLength="50"
             android:maxLines="1"
             android:text="@string/preferred_language_default"/>
 
@@ -86,6 +87,7 @@
             android:layout_height="wrap_content"
             android:hint="@string/label_other_party"
             android:inputType="textCapWords"
+            android:maxLength="50"
             android:maxLines="1"/>
 
     </android.support.design.widget.TextInputLayout>
@@ -218,6 +220,7 @@
             android:layout_marginBottom="@dimen/content_area_padding"
             android:hint="@string/label_email"
             android:inputType="textEmailAddress"
+            android:maxLength="50"
             android:maxLines="1"/>
 
     </android.support.design.widget.TextInputLayout>
diff --git a/app/src/main/res/layout/view_address.xml b/app/src/main/res/layout/view_address.xml
index 05485f2f..a16baf1f 100644
--- a/app/src/main/res/layout/view_address.xml
+++ b/app/src/main/res/layout/view_address.xml
@@ -35,6 +35,7 @@
             android:layout_height="@dimen/list_item_height"
             android:hint="@string/label_street"
             android:inputType="textPostalAddress|textCapWords"
+            android:maxLength="40"
             android:maxLines="1"/>
 
     </android.support.design.widget.TextInputLayout>
@@ -52,6 +53,7 @@
             android:layout_height="@dimen/list_item_height"
             android:hint="@string/label_unit_num"
             android:inputType="textPostalAddress|textCapWords"
+            android:maxLength="15"
             android:maxLines="1"/>
 
     </android.support.design.widget.TextInputLayout>
@@ -81,6 +83,7 @@
             android:layout_height="@dimen/list_item_height"
             android:hint="@string/label_city"
             android:inputType="textPostalAddress|textCapWords"
+            android:maxLength="35"
             android:maxLines="1"/>
 
     </android.support.design.widget.TextInputLayout>
diff --git a/app/src/main/res/layout/view_name.xml b/app/src/main/res/layout/view_name.xml
index d150140e..c56897e1 100644
--- a/app/src/main/res/layout/view_name.xml
+++ b/app/src/main/res/layout/view_name.xml
@@ -33,6 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/list_item_height"
             android:freezesText="true"
+            android:maxLength="30"
             android:hint="@string/label_first_name"
             android:inputType="textPersonName|textCapWords"
             android:maxLines="1"/>
@@ -59,6 +60,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/list_item_height"
             android:hint="@string/label_middle_name"
+            android:maxLength="30"
             android:inputType="textPersonName|textCapWords"
             android:maxLines="1"/>
 
@@ -78,6 +80,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/list_item_height"
             android:hint="@string/label_last_name"
+            android:maxLength="30"
             android:inputType="textPersonName|textCapWords"
             android:maxLines="1"/>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index cbc9d921..52412a02 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -52,7 +52,7 @@
     <string name="checkbox_mailing_address_is_different">Consigo mi correo desde una dirección diferente a la de arriba.</string>
     <string name="checkbox_address_changed">He cambiado mi dirección.</string>
     <string name="checkbox_name_changed">He cambiado mi nombre.</string>
-    <string name="label_receive_text">Estoy de acuerdo que puede llamar a %s y texto con actualizaciones importantes y recordatorios.</string>
+    <string name="label_receive_text">Estoy de acuerdo que puede llamar a %s/Pennsylvania Voice/State Voices y texto con actualizaciones importantes y recordatorios.</string>
     <string name="county_empty_error">Condado donde vive es obligatorio</string>
     <string name="label_no_address">No tengo dirección normal ni dirección permanente</string>
     <string name="error_no_address">Completa registro mediante formulario en papel</string>
diff --git a/app/src/main/res/values/open_source_licenses.xml b/app/src/main/res/values/open_source_licenses.xml
index c84a68cb..7179856b 100644
--- a/app/src/main/res/values/open_source_licenses.xml
+++ b/app/src/main/res/values/open_source_licenses.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="label_open_source_licenses">Open Source Licenses</string>
+    <string name="label_open_source_licenses" translatable="false">Open Source Licenses</string>
 
     <string name="square_license" translatable="false">
 Copyright 2013 Square, Inc.\n
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9019c6c1..65579fea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,6 @@
     <string name="dialog_enter_info" translatable="false">Enter Info</string>
 
     <!--Main Activity Strings-->
-    <string name="label_total_registered" translatable="false">Total Registered</string>
     <string name="label_registered_event">Registered</string>
     <string name="button_label_new_voter" translatable="false">New Voter</string>
     <string name="event_details" translatable="false">Event Details</string>
@@ -97,11 +96,11 @@
     <string name="label_drivers_license_id">PennDOT number</string>
     <string name="label_other_party">Other Political Party</string>
     <string name="label_does_not_have_penn_dot">I do not know my PennDOT number</string>
-    <string name="label_ssn_last_four">SSN Last Four</string>
-    <string name="label_does_not_have_ssn">I do not know the last four of my SSN</string>
+    <string name="label_ssn_last_four">Last Four Digitals of social security number</string>
+    <string name="label_does_not_have_ssn">I do not know the last four of my social security number</string>
     <string name="preferred_language_label">Preferred Language to Receive Election Materials</string>
-    <string name="section_label_election_info">Election Info</string>
-    <string name="penn_dot_enforcer_text">If you have a PA driver\'s license or PennDOT ID card number, you must use it</string>
+    <string name="section_label_election_info">Personal Info</string>
+    <string name="penn_dot_enforcer_text">If you have a PA driver\'s license or PennDOT ID card number, you must use it.  Your PennDOT is the 8 digit number found on the top right of a PA driver\'s license OR non-driver\'s state ID card</string>
     <string name="error_penn_dot">Check \"I do not know\" if you don\'t know your PennDOT number</string>
     <string name="ssn_enforcer_text">If you do not have a PennDOT number please enter the last 4 digits of your Social Security number </string>
     <string name="error_ssn">Check \"I do not know\" if you don\'t know your SSN last four</string>
@@ -224,7 +223,7 @@ Submitting an application containing false information may also subject a person
     <string name="pref_key_event_reg_total" translatable="false">event_reg_total</string>
     <string name="pref_key_app_reg_total" translatable="false">app_reg_total</string>
 
-    <string name="pref_title_partner_name" translatable="false">Partner Name</string>
+    <string name="pref_title_partner_name" translatable="false">Organization</string>
     <string name="pref_title_partner_id" translatable="false">Partner ID</string>
     <string name="pref_title_canvaser_name" translatable="false">Canvaser Name</string>
     <string name="pref_title_event_zip_code" translatable="false">Event Zip Code</string>
@@ -245,7 +244,14 @@ Submitting an application containing false information may also subject a person
 
     <string name="about_activity_text" translatable="false">
 <![CDATA[
-
+<p>
+&nbsp&nbsp&nbsp&nbsp The Pennsylvania Voter Registration App is the first of its kind in the country
+– and only available in Pennsylvania – allowing canvassers to electronically register voters using
+the Pennsylvania Department of State’s Online Web API. Pennsylvania Voice worked with Rock the Vote
+and OSET’s TrustTheVote Project to build this first-of-its-kind app that feeds registrations
+directly into the innovative PA online voter registration system, developed by the Pennsylvania
+Department of State.
+</p>
 <p>
 &nbsp&nbsp&nbsp&nbsp This mobile application “app” was built by Rock the Vote and OSET’s TrustTheVote Project
 to facilitate the submission of electronic voter registration applications in the Commonwealth of
@@ -257,6 +263,12 @@ and the
 outlined by the Pennsylvania Secretary of State’s office
 </p>
 <p>
+&nbsp&nbsp&nbsp&nbsp Pennsylvania Voice, Rock the Vote and their partners are deploying a pilot
+project in the fall of 2016 to see how this technology works in practice and measure its cost
+savings. To learn more about the 2016 Pennsylvania Voter Registration App,
+contact <a href="mailto:ovrtool@rockthevote.com">ovrtool@rockthevote.com</a>.
+</p>
+<p>
 &nbsp&nbsp&nbsp&nbsp Rock the Vote is the largest nonpartisan, nonprofit organization in the country driving the
 youth vote to the polls. Since 1990, Rock the Vote has fused pop culture, music, art and technology
 to fulfill its mission of building long-term youth political power. During the past six Presidential