From cf3b0d37b7df1845620ec1886f76a588e6cf4d21 Mon Sep 17 00:00:00 2001
From: Aaron Huttner <Double@Aarons-MacBook-Pro.local>
Date: Fri, 12 Aug 2016 11:56:27 -0400
Subject: [PATCH] Move Name to New Registrant screen, move email and phone to
 Additional Info fix keyboard scrolling bug update api endpoints

---
 .idea/gradle.xml                              |   2 +-
 app/build.gradle                              |   1 +
 .../grommet/data/ApiEndpoints.java            |   2 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../grommet/data/api/ApiModule.java           |   2 +-
 .../grommet/ui/misc/BetterSpinner.java        |  72 ++++++++
 .../ui/misc/BetterSpinnerValidator.java       |  15 ++
 .../grommet/ui/misc/BottomBarBehavior.java    |   4 +-
 .../grommet/ui/misc/ObservableValidator.java  |   1 +
 .../registration/AdditionalInfoFragment.java  | 159 +++++++++++++++---
 .../DatePickerDialogFragment.java             |   3 +-
 .../registration/NewRegistrantFragment.java   |  77 +++------
 .../ui/registration/PersonalInfoFragment.java | 122 ++------------
 .../ui/registration/RegistrationActivity.java |  10 +-
 .../grommet/ui/views/AddressView.java         |  65 +++----
 .../grommet/ui/views/NameView.java            |  48 ++----
 .../grommet/util/EmailOrEmpty.java            |  19 +++
 .../grommet/util/EmailOrEmptyRule.java        |  20 +++
 .../grommet/util/KeyboardUtil.java            |  51 ++++++
 .../grommet/util/PhoneOrEmpty.java            |  19 +++
 .../grommet/util/PhoneOrEmptyRule.java        |  29 ++++
 app/src/main/res/drawable/drop_down_arrow.xml |  11 ++
 .../main/res/layout/activity_registration.xml |   8 +-
 .../res/layout/fragment_additional_info.xml   | 152 ++++++++++++-----
 .../res/layout/fragment_new_registrant.xml    |  71 ++++----
 .../res/layout/fragment_personal_info.xml     | 112 +++---------
 .../res/layout/fragment_registration_base.xml |   4 +-
 app/src/main/res/layout/view_address.xml      |  42 +----
 app/src/main/res/layout/view_name.xml         |  35 +---
 app/src/main/res/values/dimens.xml            |   2 +
 app/src/main/res/values/ids.xml               |   4 +
 app/src/main/res/values/strings.xml           |   3 +-
 app/src/main/res/values/styles.xml            |   5 -
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 35 files changed, 667 insertions(+), 510 deletions(-)
 create mode 100644 app/src/main/java/com/rockthevote/grommet/ui/misc/BetterSpinner.java
 create mode 100644 app/src/main/java/com/rockthevote/grommet/ui/misc/BetterSpinnerValidator.java
 create mode 100644 app/src/main/java/com/rockthevote/grommet/util/EmailOrEmpty.java
 create mode 100644 app/src/main/java/com/rockthevote/grommet/util/EmailOrEmptyRule.java
 create mode 100644 app/src/main/java/com/rockthevote/grommet/util/KeyboardUtil.java
 create mode 100644 app/src/main/java/com/rockthevote/grommet/util/PhoneOrEmpty.java
 create mode 100644 app/src/main/java/com/rockthevote/grommet/util/PhoneOrEmptyRule.java
 create mode 100644 app/src/main/res/drawable/drop_down_arrow.xml
 create mode 100644 app/src/main/res/values/ids.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cfe43151..0e23f8ed 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
+        <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 a94d3a19..2362beaf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,6 +143,7 @@ dependencies {
     compile "com.android.support:cardview-v7:${supportLibVersion}"
     compile "com.android.support:design:${supportLibVersion}"
     compile 'com.google.android.gms:play-services-location:9.4.0'
+    compile 'com.googlecode.libphonenumber:libphonenumber:7.5.2'
 
     apt 'com.squareup.dagger:dagger-compiler:1.2.2'
 
diff --git a/app/src/internalDebug/java/com/rockthevote/grommet/data/ApiEndpoints.java b/app/src/internalDebug/java/com/rockthevote/grommet/data/ApiEndpoints.java
index 748d28fb..81a0768f 100644
--- a/app/src/internalDebug/java/com/rockthevote/grommet/data/ApiEndpoints.java
+++ b/app/src/internalDebug/java/com/rockthevote/grommet/data/ApiEndpoints.java
@@ -4,7 +4,7 @@
 
 public enum ApiEndpoints {
     PRODUCTION("Production", ApiModule.PRODUCTION_API_URL.toString()),
-    STAGING("Staging","https://staging.rocky.rockthevote.com/v3"),
+    STAGING("Staging","https://staging.rocky.rockthevote.com/v3/"),
     MOCK_MODE("Mock Mode", "http://localhost/mock/");
     public final String name;
     public final String url;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c3723416..23757807 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,6 +27,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
+                <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
diff --git a/app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java b/app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java
index 8ed3f6a4..e1944c39 100644
--- a/app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java
+++ b/app/src/main/java/com/rockthevote/grommet/data/api/ApiModule.java
@@ -18,7 +18,7 @@
         library = true
 )
 public final class ApiModule {
-    public static final HttpUrl PRODUCTION_API_URL = HttpUrl.parse("http://register.rockthevote.org/v3");
+    public static final HttpUrl PRODUCTION_API_URL = HttpUrl.parse("http://register.rockthevote.org/v3/");
 
     @Provides @Singleton HttpUrl provideBaseUrl() {
         return PRODUCTION_API_URL;
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/misc/BetterSpinner.java b/app/src/main/java/com/rockthevote/grommet/ui/misc/BetterSpinner.java
new file mode 100644
index 00000000..0e05212a
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/ui/misc/BetterSpinner.java
@@ -0,0 +1,72 @@
+package com.rockthevote.grommet.ui.misc;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.design.widget.TextInputEditText;
+import android.support.design.widget.TextInputLayout;
+import android.support.v7.widget.ListPopupWindow;
+import android.util.AttributeSet;
+import android.widget.AdapterView;
+import android.widget.ListAdapter;
+
+import com.rockthevote.grommet.R;
+
+
+public class BetterSpinner extends TextInputLayout {
+
+    ListPopupWindow listPopupWindow;
+    ListAdapter listAdapter;
+    TextInputEditText editText;
+
+    public BetterSpinner(Context context) {
+        this(context, null);
+    }
+
+    public BetterSpinner(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public BetterSpinner(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        editText = new TextInputEditText(context);
+        editText.setId(R.id.titleId);
+        editText.setHeight((int) getResources().getDimension(R.dimen.list_item_height));
+        editText.setFocusable(false);
+        editText.setMaxLines(1);
+        editText.setCursorVisible(false);
+        editText.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0,
+                R.drawable.drop_down_arrow, 0);
+
+        addView(editText, 0);
+        listPopupWindow = new ListPopupWindow(context);
+        listPopupWindow.setAnchorView(editText);
+    }
+
+    public void setAdapter(ListAdapter listAdapter) {
+        this.listAdapter = listAdapter;
+        listPopupWindow.setAdapter(listAdapter);
+        getEditText().setOnClickListener(view -> listPopupWindow.show());
+    }
+
+    public void setOnItemClickListener(AdapterView.OnItemClickListener listener) {
+        listPopupWindow.setOnItemClickListener(listener);
+    }
+
+    public void dismiss() {
+        listPopupWindow.dismiss();
+    }
+
+    /**
+     * set the height of the popup window in pixes
+     */
+    public void setHeight(int height) {
+        listPopupWindow.setHeight(height);
+    }
+
+    @NonNull
+    @Override
+    public TextInputEditText getEditText() {
+        return editText;
+    }
+}
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/misc/BetterSpinnerValidator.java b/app/src/main/java/com/rockthevote/grommet/ui/misc/BetterSpinnerValidator.java
new file mode 100644
index 00000000..0693d09c
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/ui/misc/BetterSpinnerValidator.java
@@ -0,0 +1,15 @@
+package com.rockthevote.grommet.ui.misc;
+
+import com.mobsandgeeks.saripaar.adapter.ViewDataAdapter;
+import com.mobsandgeeks.saripaar.exception.ConversionException;
+
+public class BetterSpinnerValidator implements ViewDataAdapter<BetterSpinner, String> {
+    @Override
+    public String getData(BetterSpinner view) throws ConversionException {
+        if (view.getEditText() != null) {
+            return view.getEditText().getText().toString();
+        } else {
+            return "";
+        }
+    }
+}
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/misc/BottomBarBehavior.java b/app/src/main/java/com/rockthevote/grommet/ui/misc/BottomBarBehavior.java
index 7af627cf..5aed4934 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/misc/BottomBarBehavior.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/misc/BottomBarBehavior.java
@@ -53,7 +53,9 @@ public void onNestedScroll(final CoordinatorLayout coordinatorLayout, final V ch
                                final View target, final int dxConsumed, final int dyConsumed,
                                final int dxUnconsumed, final int dyUnconsumed) {
         super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
-        if (dyConsumed > 10 && child.getVisibility() != View.VISIBLE) {
+        if (dyConsumed > 0 && child.getVisibility() != View.VISIBLE) {
+            animateIn(child);
+        } else if (dyConsumed == 0 && dyUnconsumed > 0 && child.getVisibility() != View.VISIBLE) {
             animateIn(child);
         } else if (dyConsumed < 0 && !this.mIsAnimatingOut && child.getVisibility() == View.VISIBLE) {
             animateOut(child);
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/misc/ObservableValidator.java b/app/src/main/java/com/rockthevote/grommet/ui/misc/ObservableValidator.java
index 92e3344b..37cd13e1 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/misc/ObservableValidator.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/misc/ObservableValidator.java
@@ -19,6 +19,7 @@ public class ObservableValidator {
     public ObservableValidator(Object controller, Context context) {
         Validator validator = new Validator(controller);
         validator.registerAdapter(TextInputLayout.class, new TilStringValidator());
+        validator.registerAdapter(BetterSpinner.class, new BetterSpinnerValidator());
         validator.setViewValidatedAction(new Validator.ViewValidatedAction() {
             @Override
             public void onAllRulesPassed(View view) {
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/AdditionalInfoFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/AdditionalInfoFragment.java
index 16150edc..3a965ac3 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/AdditionalInfoFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/AdditionalInfoFragment.java
@@ -3,24 +3,29 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
+import android.telephony.PhoneNumberFormattingTextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.EditText;
-import android.widget.Spinner;
 
 import com.f2prateek.rx.preferences.Preference;
-import com.jakewharton.rxbinding.widget.RxAdapterView;
+import com.jakewharton.rxbinding.widget.RxCompoundButton;
 import com.jakewharton.rxbinding.widget.RxTextView;
+import com.mobsandgeeks.saripaar.Validator;
 import com.mobsandgeeks.saripaar.annotation.NotEmpty;
 import com.rockthevote.grommet.R;
 import com.rockthevote.grommet.data.db.model.AdditionalInfo;
+import com.rockthevote.grommet.data.db.model.ContactMethod;
 import com.rockthevote.grommet.data.db.model.RockyRequest;
 import com.rockthevote.grommet.data.db.model.VoterId;
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
+import com.rockthevote.grommet.ui.misc.BetterSpinner;
 import com.rockthevote.grommet.ui.misc.EnumAdapter;
 import com.rockthevote.grommet.ui.misc.ObservableValidator;
+import com.rockthevote.grommet.util.EmailOrEmpty;
+import com.rockthevote.grommet.util.PhoneOrEmpty;
 import com.squareup.sqlbrite.BriteDatabase;
 
 import java.util.concurrent.TimeUnit;
@@ -37,15 +42,20 @@
 
 import static com.rockthevote.grommet.data.db.Db.DEBOUNCE;
 import static com.rockthevote.grommet.data.db.model.AdditionalInfo.Type.LANGUAGE_PREF;
+import static com.rockthevote.grommet.data.db.model.ContactMethod.Type.EMAIL;
+import static com.rockthevote.grommet.data.db.model.ContactMethod.Type.PHONE;
 import static com.rockthevote.grommet.data.db.model.RockyRequest.Party;
 import static com.rockthevote.grommet.data.db.model.RockyRequest.Race;
 import static com.rockthevote.grommet.data.db.model.VoterId.Type.DRIVERS_LICENSE;
 
 public class AdditionalInfoFragment extends BaseRegistrationFragment {
 
-    @BindView(R.id.spinner_race) Spinner raceSpinner;
-    @BindView(R.id.spinner_party) Spinner partySpinner;
+    @BindView(R.id.spinner_race) BetterSpinner raceSpinner;
+
+    @BindView(R.id.spinner_party) BetterSpinner partySpinner;
+
     @BindView(R.id.preferred_language) EditText preferredLanguage;
+
     @BindView(R.id.til_drivers_license) TextInputLayout driversLicenseTIL;
 
     @BindView(R.id.drivers_license_checkbox) CheckBox hasDriversLicense;
@@ -53,6 +63,21 @@ public class AdditionalInfoFragment extends BaseRegistrationFragment {
     @NotEmpty
     @BindView(R.id.drivers_license) EditText driversLicenseEditText;
 
+    @EmailOrEmpty(messageResId = R.string.email_error)
+    @BindView(R.id.til_email) TextInputLayout textInputEmail;
+
+    @BindView(R.id.email_edit_text) EditText email;
+
+    @BindView(R.id.email_opt_in) CheckBox emailOptIn;
+
+    @PhoneOrEmpty(messageResId = R.string.phone_format_error)
+    @BindView(R.id.til_phone_number) TextInputLayout phoneNumber;
+
+    @BindView(R.id.phone) EditText phone;
+
+    @BindView(R.id.spinner_phone_type) BetterSpinner phoneTypeSpinner;
+
+    @BindView(R.id.checkbox_can_receive_text) CheckBox phoneOptIn;
 
     @Inject @CurrentRockyRequestId Preference<Long> rockyRequestRowId;
 
@@ -63,6 +88,9 @@ public class AdditionalInfoFragment extends BaseRegistrationFragment {
     private EnumAdapter<Race> raceEnumAdapter;
     private EnumAdapter<Party> partyEnumAdapter;
 
+    private EnumAdapter<RockyRequest.PhoneType> phoneTypeEnumAdapter;
+    private PhoneNumberFormattingTextWatcher phoneFormatter;
+
     private final PublishSubject<Boolean> hasDriversLicenseChecked = PublishSubject.create();
 
     @Nullable
@@ -76,13 +104,35 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         ButterKnife.bind(this, view);
+
+        Validator.registerAnnotation(PhoneOrEmpty.class);
+        Validator.registerAnnotation(EmailOrEmpty.class);
+
         validator = new ObservableValidator(this, getActivity());
 
         raceEnumAdapter = new EnumAdapter<>(getActivity(), Race.class);
         raceSpinner.setAdapter(raceEnumAdapter);
+        raceSpinner.setOnItemClickListener((adapterView, view1, i, l) -> {
+            raceSpinner.getEditText().setText(raceEnumAdapter.getItem(i).toString());
+            raceSpinner.dismiss();
+        });
+        raceSpinner.getEditText().setText(Race.OTHER.toString());
 
         partyEnumAdapter = new EnumAdapter<>(getActivity(), Party.class);
         partySpinner.setAdapter(partyEnumAdapter);
+        partySpinner.setOnItemClickListener((adapterView, view1, i, l) -> {
+            partySpinner.getEditText().setText(partyEnumAdapter.getItem(i).toString());
+            partySpinner.dismiss();
+        });
+        partySpinner.getEditText().setText(Party.OTHER.toString());
+
+        phoneTypeEnumAdapter = new EnumAdapter<>(getActivity(), RockyRequest.PhoneType.class);
+        phoneTypeSpinner.setAdapter(phoneTypeEnumAdapter);
+        phoneTypeSpinner.setOnItemClickListener((adapterView, view1, i, l) -> {
+            phoneTypeSpinner.getEditText().setText(phoneTypeEnumAdapter.getItem(i).toString());
+            phoneTypeSpinner.dismiss();
+        });
+        phoneTypeSpinner.getEditText().setText(phoneTypeEnumAdapter.getItem(0).toString());
     }
 
     @Override
@@ -90,24 +140,27 @@ public void onResume() {
         super.onResume();
         subscriptions = new CompositeSubscription();
 
-        subscriptions.add(RxAdapterView.itemSelections(raceSpinner)
+        phoneFormatter = new PhoneNumberFormattingTextWatcher();
+        phone.addTextChangedListener(phoneFormatter);
+
+        subscriptions.add(RxTextView.afterTextChangeEvents(raceSpinner.getEditText())
                 .observeOn(Schedulers.io())
                 .skip(1)
-                .subscribe(pos -> {
+                .subscribe(race -> {
                     db.update(RockyRequest.TABLE,
                             new RockyRequest.Builder()
-                                    .race(raceEnumAdapter.getItem(pos))
+                                    .race(Race.fromString(race.editable().toString()))
                                     .build(),
                             RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
                 }));
 
-        subscriptions.add(RxAdapterView.itemSelections(partySpinner)
+        subscriptions.add(RxTextView.afterTextChangeEvents(partySpinner.getEditText())
                 .observeOn(Schedulers.io())
                 .skip(1)
-                .subscribe(pos -> {
+                .subscribe(party -> {
                     db.update(RockyRequest.TABLE,
                             new RockyRequest.Builder()
-                                    .party(partyEnumAdapter.getItem(pos))
+                                    .party(Party.fromString(party.editable().toString()))
                                     .build(),
                             RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
                 }));
@@ -137,6 +190,74 @@ public void onResume() {
                     VoterId.insertOrUpdate(db, rockyRequestRowId.get(), DRIVERS_LICENSE, contentValues);
                 }));
 
+        subscriptions.add(RxTextView.afterTextChangeEvents(email)
+                .observeOn(Schedulers.io())
+                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
+                .skip(1)
+                .subscribe(event ->
+                {
+                    ContactMethod.insertOrUpdate(db, rockyRequestRowId.get(), EMAIL,
+                            new ContactMethod.Builder()
+                                    .value(event.editable().toString())
+                                    .build());
+                }));
+
+        subscriptions.add(RxCompoundButton.checkedChanges(emailOptIn)
+                .observeOn(Schedulers.io())
+                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
+                .skip(1)
+                .subscribe(checked -> {
+                    db.update(
+                            RockyRequest.TABLE,
+                            new RockyRequest.Builder()
+                                    .optInEmail(checked)
+                                    .build(),
+                            RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
+                }));
+
+        subscriptions.add(RxTextView.afterTextChangeEvents(phone)
+                .observeOn(Schedulers.io())
+                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
+                .skip(1)
+                .subscribe(event -> {
+                    ContactMethod.insertOrUpdate(db, rockyRequestRowId.get(), PHONE,
+                            new ContactMethod.Builder()
+                                    .value(event.editable().toString())
+                                    .build()
+                    );
+                }));
+
+        subscriptions.add(RxTextView.afterTextChangeEvents(phoneTypeSpinner.getEditText())
+                .observeOn(Schedulers.io())
+                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
+                .subscribe(phoneType -> {
+                    db.update(RockyRequest.TABLE,
+                            new RockyRequest.Builder()
+                                    .phoneType(RockyRequest.PhoneType.fromString(phoneType.editable().toString()))
+                                    .build(),
+                            RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
+
+                }));
+
+        subscriptions.add(RxCompoundButton.checkedChanges(phoneOptIn)
+                .observeOn(Schedulers.io())
+                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
+                .skip(1)
+                .subscribe(checked -> {
+                    db.update(
+                            RockyRequest.TABLE,
+                            new RockyRequest.Builder()
+                                    .optInSMS(checked)
+                                    .build(),
+                            RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
+                }));
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        subscriptions.unsubscribe();
+        phone.removeTextChangedListener(phoneFormatter);
     }
 
     /**
@@ -147,23 +268,15 @@ public void onResume() {
     @OnCheckedChanged(R.id.drivers_license_checkbox)
     public void onCheckChanged(boolean checked) {
         driversLicenseTIL.setVisibility(checked ? View.VISIBLE : View.GONE);
+
+        // disabling it prevents Saripaar from trying to validate it
+        driversLicenseTIL.setEnabled(checked);
+        driversLicenseTIL.setErrorEnabled(checked);
         hasDriversLicenseChecked.onNext(checked);
     }
 
-
     @Override
     public Observable<Boolean> verify() {
-        if (hasDriversLicense.isChecked()) {
-            return validator.validate();
-        } else {
-            return super.verify();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        subscriptions.unsubscribe();
+        return validator.validate();
     }
-
 }
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/DatePickerDialogFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/DatePickerDialogFragment.java
index b9f3f130..fefc037c 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/DatePickerDialogFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/DatePickerDialogFragment.java
@@ -3,6 +3,7 @@
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 
 import com.rockthevote.grommet.R;
@@ -11,7 +12,6 @@ public class DatePickerDialogFragment extends DialogFragment {
 
     private DatePickerDialog.OnDateSetListener listener;
 
-
     public static DatePickerDialogFragment newInstance(DatePickerDialog.OnDateSetListener listener){
         DatePickerDialogFragment fragment = new DatePickerDialogFragment();
         fragment.setListener(listener);
@@ -22,6 +22,7 @@ private void setListener(DatePickerDialog.OnDateSetListener listener){
         this.listener = listener;
     }
 
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         // start the date picker at Jan 1, 1998
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/NewRegistrantFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/NewRegistrantFragment.java
index cf17139d..301f8292 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/NewRegistrantFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/NewRegistrantFragment.java
@@ -13,16 +13,14 @@
 
 import com.f2prateek.rx.preferences.Preference;
 import com.jakewharton.rxbinding.widget.RxCompoundButton;
-import com.jakewharton.rxbinding.widget.RxTextView;
 import com.mobsandgeeks.saripaar.annotation.Checked;
 import com.mobsandgeeks.saripaar.annotation.NotEmpty;
-import com.mobsandgeeks.saripaar.annotation.Pattern;
 import com.rockthevote.grommet.R;
-import com.rockthevote.grommet.data.db.model.ContactMethod;
 import com.rockthevote.grommet.data.db.model.RockyRequest;
 import com.rockthevote.grommet.data.db.model.VoterClassification;
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
 import com.rockthevote.grommet.ui.misc.ObservableValidator;
+import com.rockthevote.grommet.ui.views.NameView;
 import com.rockthevote.grommet.util.Dates;
 import com.squareup.sqlbrite.BriteDatabase;
 
@@ -33,41 +31,29 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnCheckedChanged;
 import butterknife.OnClick;
 import rx.Observable;
 import rx.schedulers.Schedulers;
 import rx.subscriptions.CompositeSubscription;
 
 import static com.rockthevote.grommet.data.db.Db.DEBOUNCE;
-import static com.rockthevote.grommet.data.db.model.ContactMethod.Type.EMAIL;
 import static com.rockthevote.grommet.data.db.model.VoterClassification.Type.CITIZEN;
 import static com.rockthevote.grommet.data.db.model.VoterClassification.Type.EIGHTEEN;
 
 public class NewRegistrantFragment extends BaseRegistrationFragment implements
         DatePickerDialog.OnDateSetListener {
 
-    private static final String EMAIL_OR_EMPTY_REGEX = "^$|(?:[a-z0-9!#$%&'*+\\/=?^_`{|}~-]+"
-            + "(?:\\.[a-z0-9!#$%&'*+\\/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\"
-            + "x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:"
-            + "(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\"
-            + "[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?"
-            + "[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\"
-            + "x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])";
-
-    @Pattern(regex = EMAIL_OR_EMPTY_REGEX,
-             messageResId = R.string.email_error,
-             caseSensitive = false)
-    @BindView(R.id.text_input_layout_email)
-    TextInputLayout textInputEmail;
-    @BindView(R.id.edittext_email) TextInputEditText email;
+    @BindView(R.id.name) NameView name;
+    @BindView(R.id.name_changed) CheckBox nameChanged;
+    @BindView(R.id.previous_name_divider) View previousNameDivider;
+    @BindView(R.id.previous_name) NameView previousName;
 
     @NotEmpty
     @BindView(R.id.til_birthday)
     TextInputLayout tilBirthday;
     @BindView(R.id.edittext_birthday) TextInputEditText birthday;
 
-    @BindView(R.id.email_opt_in) CheckBox emailOptIn;
-
     @Checked(messageResId = R.string.eighteen_or_older_err)
     @BindView(R.id.checkbox_is_eighteen)
     CheckBox checkBoxIsEighteen;
@@ -83,7 +69,6 @@ public class NewRegistrantFragment extends BaseRegistrationFragment implements
 
     private CompositeSubscription subscriptions;
 
-
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -103,32 +88,6 @@ public void onResume() {
         super.onResume();
         subscriptions = new CompositeSubscription();
 
-        subscriptions.add(RxTextView.afterTextChangeEvents(email)
-                .observeOn(Schedulers.io())
-                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
-                .skip(1)
-                .subscribe(event ->
-                {
-                    ContactMethod.insertOrUpdate(db, rockyRequestRowId.get(), EMAIL,
-                            new ContactMethod.Builder()
-                                    .value(event.editable().toString())
-                                    .build());
-                }));
-
-
-        subscriptions.add(RxCompoundButton.checkedChanges(emailOptIn)
-                .observeOn(Schedulers.io())
-                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
-                .skip(1)
-                .subscribe(checked -> {
-                    db.update(
-                            RockyRequest.TABLE,
-                            new RockyRequest.Builder()
-                                    .optInEmail(checked)
-                                    .build(),
-                            RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
-                }));
-
         subscriptions.add(RxCompoundButton.checkedChanges(checkBoxIsUSCitizen)
                 .observeOn(Schedulers.io())
                 .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
@@ -163,6 +122,12 @@ public void onClickBirthday(View v) {
         DatePickerDialogFragment.newInstance(this).show(getFragmentManager(), "datepicker");
     }
 
+    @OnCheckedChanged(R.id.name_changed)
+    public void onNameChangedChecked(boolean checked) {
+        previousName.setVisibility(checked ? View.VISIBLE : View.GONE);
+        previousNameDivider.setVisibility(checked ? View.VISIBLE : View.GONE);
+    }
+
     @Override
     public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
         GregorianCalendar date = new GregorianCalendar(year, monthOfYear, dayOfMonth);
@@ -178,7 +143,21 @@ public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth
 
     @Override
     public Observable<Boolean> verify() {
-        return validator.validate();
-    }
 
+        Observable<Boolean> previousNameObs = previousName.verify()
+                .flatMap(val -> Observable.just(nameChanged.isChecked() ? val : true));
+
+        return validator.validate()
+                .concatWith(name.verify())
+                .concatWith(previousNameObs)
+                .toList()
+                .flatMap(list -> {
+                    Boolean ret = true;
+                    for (Boolean val : list) {
+                        ret = ret && val;
+                    }
+
+                    return Observable.just(ret);
+                });
+    }
 }
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/PersonalInfoFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/PersonalInfoFragment.java
index b8c27382..98697131 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/PersonalInfoFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/PersonalInfoFragment.java
@@ -2,80 +2,46 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.widget.ListPopupWindow;
-import android.telephony.PhoneNumberFormattingTextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
-import android.widget.EditText;
 
 import com.f2prateek.rx.preferences.Preference;
-import com.jakewharton.rxbinding.widget.RxTextView;
-import com.mobsandgeeks.saripaar.annotation.Pattern;
 import com.rockthevote.grommet.R;
-import com.rockthevote.grommet.data.db.model.ContactMethod;
 import com.rockthevote.grommet.data.db.model.RockyRequest;
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
-import com.rockthevote.grommet.ui.misc.EnumAdapter;
-import com.rockthevote.grommet.ui.misc.ObservableValidator;
 import com.rockthevote.grommet.ui.views.AddressView;
-import com.rockthevote.grommet.ui.views.NameView;
 import com.squareup.sqlbrite.BriteDatabase;
 
-import java.util.concurrent.TimeUnit;
-
 import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnCheckedChanged;
-import butterknife.OnClick;
 import rx.Observable;
-import rx.schedulers.Schedulers;
-import rx.subscriptions.CompositeSubscription;
-
-import static com.rockthevote.grommet.data.db.Db.DEBOUNCE;
-import static com.rockthevote.grommet.data.db.model.ContactMethod.Type.PHONE;
-import static com.rockthevote.grommet.data.db.model.RockyRequest.PhoneType;
 
 
 public class PersonalInfoFragment extends BaseRegistrationFragment {
-    private static final String PHONE_REGEX = ""    // sdd = space, dot, or dash
-            + "(^$|)|"                           // empty string
-            + "(\\+[0-9]+[\\- \\.]*)?"              // +<digits><sdd>*
-            + "(\\([0-9]+\\)[\\- \\.]*)?"           // (<digits>)<sdd>*
-            + "([0-9][0-9\\- \\.]+[0-9])";          // <digit><digit|sdd>+<digit>
-
-
-    @BindView(R.id.name) NameView name;
-    @BindView(R.id.name_changed) CheckBox nameChanged;
-    @BindView(R.id.previous_name_divider) View previousNameDivider;
-    @BindView(R.id.previous_name) NameView previousName;
 
     @BindView(R.id.home_address) AddressView homeAddress;
+
     @BindView(R.id.mailing_address) AddressView mailingAddress;
+
     @BindView(R.id.previous_address) AddressView previousAddress;
+
     @BindView(R.id.mailing_address_is_different) CheckBox mailingAddressIsDifferent;
+
     @BindView(R.id.address_changed) CheckBox addressChanged;
-    @BindView(R.id.phone) EditText phone;
 
-    @Pattern(regex = PHONE_REGEX, messageResId = R.string.phone_format_error)
-    @BindView(R.id.til_phone_number) TextInputLayout phoneNumber;
-    @BindView(R.id.phone_type_edit_text) EditText phoneTypeEditText;
+    @BindView(R.id.mailing_address_divider) View maillingDivider;
+
+    @BindView(R.id.previous_address_divider) View prevDivider;
 
     @Inject @CurrentRockyRequestId Preference<Long> rockyRequestRowId;
 
     @Inject BriteDatabase db;
 
-    private EnumAdapter<RockyRequest.PhoneType> phoneTypeEnumAdapter;
-
-    private CompositeSubscription subscriptions;
-    private PhoneNumberFormattingTextWatcher phoneFormatter;
-    private ObservableValidator validator;
-    private ListPopupWindow phoneTypePopup;
-
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -87,61 +53,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         ButterKnife.bind(this, view);
-
-        phoneTypeEnumAdapter = new EnumAdapter<>(getActivity(), RockyRequest.PhoneType.class);
-        phoneTypePopup = new ListPopupWindow(getContext());
-        phoneTypePopup.setAdapter(phoneTypeEnumAdapter);
-        phoneTypePopup.setAnchorView(phoneTypeEditText);
-        phoneTypePopup.setOnItemClickListener((adapterView, view1, i, l) -> {
-            phoneTypeEditText.setText(phoneTypeEnumAdapter.getItem(i).toString());
-            phoneTypePopup.dismiss();
-        });
-        phoneTypeEditText.setText(phoneTypeEnumAdapter.getItem(0).toString());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        validator = new ObservableValidator(this, getContext());
-        subscriptions = new CompositeSubscription();
-        phoneFormatter = new PhoneNumberFormattingTextWatcher();
-        phone.addTextChangedListener(phoneFormatter);
-
-        subscriptions.add(RxTextView.afterTextChangeEvents(phone)
-                .observeOn(Schedulers.io())
-                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
-                .skip(1)
-                .subscribe(event -> {
-                    ContactMethod.insertOrUpdate(db, rockyRequestRowId.get(), PHONE,
-                            new ContactMethod.Builder()
-                                    .value(event.editable().toString())
-                                    .build()
-                    );
-                }));
-
-        subscriptions.add(RxTextView.afterTextChangeEvents(phoneTypeEditText)
-                .observeOn(Schedulers.io())
-                .debounce(DEBOUNCE, TimeUnit.MILLISECONDS)
-                .subscribe(phoneType -> {
-                    db.update(RockyRequest.TABLE,
-                            new RockyRequest.Builder()
-                                    .phoneType(PhoneType.fromString(phoneType.editable().toString()))
-                                    .build(),
-                            RockyRequest._ID + " = ? ", String.valueOf(rockyRequestRowId.get()));
-
-                }));
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        subscriptions.unsubscribe();
-        phone.removeTextChangedListener(phoneFormatter);
     }
 
     @OnCheckedChanged(R.id.mailing_address_is_different)
     public void onMailingAddressDifferentChecked(boolean checked) {
         mailingAddress.setVisibility(checked ? View.VISIBLE : View.GONE);
+        maillingDivider.setVisibility(checked ? View.VISIBLE : View.GONE);
+
         db.update(RockyRequest.TABLE,
                 new RockyRequest.Builder()
                         .regIsMail(!checked)
@@ -152,36 +70,19 @@ public void onMailingAddressDifferentChecked(boolean checked) {
     @OnCheckedChanged(R.id.address_changed)
     public void onAddressChangeChecked(boolean checked) {
         previousAddress.setVisibility(checked ? View.VISIBLE : View.GONE);
-    }
-
-    @OnCheckedChanged(R.id.name_changed)
-    public void onNameChangedChecked(boolean checked) {
-        previousName.setVisibility(checked ? View.VISIBLE : View.GONE);
-        previousNameDivider.setVisibility(checked ? View.VISIBLE : View.GONE);
-    }
-
-    @OnClick(R.id.phone_type_edit_text)
-    public void onPhoneTypeClick(View v) {
-        phoneTypePopup.show();
+        prevDivider.setVisibility(checked ? View.VISIBLE : View.GONE);
     }
 
     @Override
     public Observable<Boolean> verify() {
 
-        Observable<Boolean> previousNameObs = previousName.verify()
-                .flatMap(val -> Observable.just(nameChanged.isChecked() ? val : true));
-
         Observable<Boolean> mailingAddressObs = mailingAddress.verify()
                 .flatMap(val -> Observable.just(mailingAddressIsDifferent.isChecked() ? val : true));
 
         Observable<Boolean> changedAddObs = previousAddress.verify()
                 .flatMap(val -> Observable.just(addressChanged.isChecked() ? val : true));
 
-        //TODO instead of concat I could do a toBlocking and then do an Observable.just(foo,bar,...)
-        return validator.validate()
-                .concatWith(name.verify())
-                .concatWith(previousNameObs)
-                .concatWith(homeAddress.verify())
+        return homeAddress.verify()
                 .concatWith(mailingAddressObs)
                 .concatWith(changedAddObs)
                 .toList()
@@ -193,6 +94,5 @@ public Observable<Boolean> verify() {
 
                     return Observable.just(ret);
                 });
-
     }
 }
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
index 793f7198..c158410f 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.AlertDialog;
 import android.os.Bundle;
+import android.support.design.widget.AppBarLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
@@ -18,6 +19,7 @@
 import com.rockthevote.grommet.ui.BaseActivity;
 import com.rockthevote.grommet.ui.ViewContainer;
 import com.rockthevote.grommet.ui.misc.StepperTabLayout;
+import com.rockthevote.grommet.util.KeyboardUtil;
 import com.squareup.sqlbrite.BriteDatabase;
 
 import javax.inject.Inject;
@@ -37,7 +39,7 @@ public class RegistrationActivity extends BaseActivity {
     @Inject @CurrentRockyRequestId Preference<Long> rockyRequestRowId;
     @Inject BriteDatabase db;
 
-
+    @BindView(R.id.appbar) AppBarLayout appbar;
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.viewPager) ViewPager viewPager;
     @BindView(R.id.tabLayout) StepperTabLayout tabLayout;
@@ -48,6 +50,8 @@ public class RegistrationActivity extends BaseActivity {
 
     private OnPageChangeListener listener;
 
+    private KeyboardUtil keyboardUtil;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -59,6 +63,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(false);
         setupViewPager();
+        keyboardUtil = new KeyboardUtil(this, appbar);
     }
 
     private void setupViewPager() {
@@ -82,12 +87,14 @@ protected void onResume() {
         listener = new RegistrationPageListener();
         viewPager.addOnPageChangeListener(listener);
         updateNavigation(viewPager.getCurrentItem());
+        keyboardUtil.enable();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         viewPager.removeOnPageChangeListener(listener);
+        keyboardUtil.disable();
     }
 
     private void updateNavigation(int pagePosition) {
@@ -196,5 +203,4 @@ public void onPageSelected(int position) {
         public void onPageScrollStateChanged(int state) {
         }
     }
-
 }
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java b/app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java
index 4e308fd5..06cbe47c 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/views/AddressView.java
@@ -5,11 +5,9 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.design.widget.TextInputLayout;
-import android.support.v7.widget.ListPopupWindow;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -22,6 +20,7 @@
 import com.rockthevote.grommet.data.Injector;
 import com.rockthevote.grommet.data.db.model.Address;
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
+import com.rockthevote.grommet.ui.misc.BetterSpinner;
 import com.rockthevote.grommet.ui.misc.ChildrenViewStateHelper;
 import com.rockthevote.grommet.ui.misc.ObservableValidator;
 import com.squareup.sqlbrite.BriteDatabase;
@@ -32,7 +31,6 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import rx.Observable;
 import rx.schedulers.Schedulers;
 import rx.subscriptions.CompositeSubscription;
@@ -49,14 +47,13 @@ public class AddressView extends FrameLayout {
     @BindView(R.id.unit) EditText unitEditText;
 
     @NotEmpty
-    @BindView(R.id.til_county) TextInputLayout countyTIL;
-    @BindView(R.id.county_edit_text) EditText countyEditText;
+    @BindView(R.id.spinner_county) BetterSpinner countySpinner;
 
     @NotEmpty
     @BindView(R.id.til_city) TextInputLayout cityTIL;
     @BindView(R.id.city) EditText cityEditText;
 
-    @BindView(R.id.state_edit_text) EditText stateEditText;
+    @BindView(R.id.spinner_state) BetterSpinner stateSpinner;
 
     @NotEmpty
     @BindView(R.id.til_zip_code) TextInputLayout zipTIL;
@@ -80,10 +77,6 @@ public class AddressView extends FrameLayout {
 
     private CompositeSubscription subscriptions = new CompositeSubscription();
 
-    private ListPopupWindow statePopup;
-
-    private ListPopupWindow countyPopup;
-
     public AddressView(Context context) {
         this(context, null);
     }
@@ -145,39 +138,35 @@ protected void onFinishInflate() {
                 R.array.pa_counties, android.R.layout.simple_list_item_1);
         countyAdapter.setDropDownViewResource(android.R.layout.simple_list_item_1);
 
-        countyPopup = new ListPopupWindow(getContext());
-        countyPopup.setAdapter(countyAdapter);
-        countyPopup.setAnchorView(countyEditText);
-        countyPopup.setHeight((int) getResources().getDimension(R.dimen.list_pop_up_max_height));
-        countyPopup.setOnItemClickListener((adapterView, view, i, l) -> {
-            countyEditText.setText(countyAdapter.getItem(i));
-            countyPopup.dismiss();
+        countySpinner.setAdapter(countyAdapter);
+        countySpinner.setHeight((int) getResources().getDimension(R.dimen.list_pop_up_max_height));
+        countySpinner.setOnItemClickListener((adapterView, view, i, l) -> {
+            countySpinner.getEditText().setText(countyAdapter.getItem(i));
+            countySpinner.dismiss();
         });
 
         stateAdapter = ArrayAdapter.createFromResource(getContext(),
                 R.array.states, android.R.layout.simple_list_item_1);
         stateAdapter.setDropDownViewResource(android.R.layout.simple_list_item_1);
 
-        statePopup = new ListPopupWindow(getContext());
-        statePopup.setAdapter(stateAdapter);
-        statePopup.setAnchorView(stateEditText);
-        statePopup.setHeight((int)getResources().getDimension(R.dimen.list_pop_up_max_height));
-        statePopup.setOnItemClickListener((adapterView, view, i, l) -> {
-            stateEditText.setText(stateAdapter.getItem(i));
+        stateSpinner.setAdapter(stateAdapter);
+        stateSpinner.setHeight((int) getResources().getDimension(R.dimen.list_pop_up_max_height));
+        stateSpinner.setOnItemClickListener((adapterView, view, i, l) -> {
+            stateSpinner.getEditText().setText(stateAdapter.getItem(i));
 
             if(!PA_ABREV.equals(stateAdapter.getItem(i))){
-                countyTIL.setErrorEnabled(false);
-                countyTIL.setEnabled(false);
-                countyEditText.setText("");
-                countyEditText.setEnabled(false);
+                stateSpinner.setErrorEnabled(false);
+                stateSpinner.setEnabled(false);
+                stateSpinner.getEditText().setText("");
+                stateSpinner.getEditText().setEnabled(false);
             } else {
-                countyEditText.setEnabled(true);
-                countyTIL.setEnabled(true);
+                stateSpinner.getEditText().setEnabled(true);
+                stateSpinner.setEnabled(true);
             }
 
-            statePopup.dismiss();
+            stateSpinner.dismiss();
         });
-        stateEditText.setText(stateAdapter.getItem(stateAdapter.getPosition(PA_ABREV)));
+        stateSpinner.getEditText().setText(stateAdapter.getItem(stateAdapter.getPosition(PA_ABREV)));
 
     }
 
@@ -188,9 +177,9 @@ protected void onAttachedToWindow() {
         subscriptions.add(Observable.combineLatest(RxTextView.afterTextChangeEvents(streetEditText),
                 RxTextView.afterTextChangeEvents(unitEditText),
                 RxTextView.afterTextChangeEvents(cityEditText),
-                RxTextView.afterTextChangeEvents(stateEditText),
+                RxTextView.afterTextChangeEvents(stateSpinner.getEditText()),
                 RxTextView.afterTextChangeEvents(zipEditText),
-                RxTextView.afterTextChangeEvents(countyEditText),
+                RxTextView.afterTextChangeEvents(stateSpinner.getEditText()),
                 (street, unit, city, state, zip, county) -> new Address.Builder()
                         .streetName(street.editable().toString())
                         .subAddress(unit.editable().toString())
@@ -207,16 +196,6 @@ protected void onAttachedToWindow() {
 
     }
 
-    @OnClick(R.id.state_edit_text)
-    public void onStateClick(View v){
-        statePopup.show();
-    }
-
-    @OnClick(R.id.county_edit_text)
-    public void onCountyClick(View v) {
-        countyPopup.show();
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/views/NameView.java b/app/src/main/java/com/rockthevote/grommet/ui/views/NameView.java
index c2ad5dcf..049a27d9 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/views/NameView.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/views/NameView.java
@@ -5,11 +5,9 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.design.widget.TextInputLayout;
-import android.support.v7.widget.ListPopupWindow;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.TextView;
@@ -21,6 +19,7 @@
 import com.rockthevote.grommet.data.Injector;
 import com.rockthevote.grommet.data.db.model.Name;
 import com.rockthevote.grommet.data.prefs.CurrentRockyRequestId;
+import com.rockthevote.grommet.ui.misc.BetterSpinner;
 import com.rockthevote.grommet.ui.misc.ChildrenViewStateHelper;
 import com.rockthevote.grommet.ui.misc.EnumAdapter;
 import com.rockthevote.grommet.ui.misc.ObservableValidator;
@@ -32,7 +31,6 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import rx.Observable;
 import rx.schedulers.Schedulers;
 import rx.subscriptions.CompositeSubscription;
@@ -46,9 +44,9 @@ public class NameView extends FrameLayout {
     @BindView(R.id.name_section_title) TextView sectionTitle;
 
     @NotEmpty
-    @BindView(R.id.til_title) TextInputLayout titleTIL;
-    @BindView(R.id.title_edittext) EditText titleEditText;
-    @BindView(R.id.suffix_edittext) EditText suffixEditText;
+    @BindView(R.id.spinner_title) BetterSpinner titleSpinner;
+
+    @BindView(R.id.spinner_suffix) BetterSpinner suffixSpinner;
 
     @NotEmpty
     @BindView(R.id.til_first_name) TextInputLayout firstNameTIL;
@@ -74,10 +72,6 @@ public class NameView extends FrameLayout {
 
     private CompositeSubscription subscriptions = new CompositeSubscription();
 
-    private ListPopupWindow titlePopup;
-
-    private ListPopupWindow suffixPopup;
-
     public NameView(Context context) {
         this(context, null);
     }
@@ -132,21 +126,17 @@ protected void onFinishInflate() {
         }
 
         titleEnumAdapter = new EnumAdapter<>(getContext(), Name.Prefix.class);
-        titlePopup = new ListPopupWindow(getContext());
-        titlePopup.setAdapter(titleEnumAdapter);
-        titlePopup.setAnchorView(titleEditText);
-        titlePopup.setOnItemClickListener((adapterView, view, i, l) -> {
-            titleEditText.setText(titleEnumAdapter.getItem(i).toString());
-            titlePopup.dismiss();
+        titleSpinner.setAdapter(titleEnumAdapter);
+        titleSpinner.setOnItemClickListener((adapterView, view, i, l) -> {
+            titleSpinner.getEditText().setText(titleEnumAdapter.getItem(i).toString());
+            titleSpinner.dismiss();
         });
 
         suffixEnumAdapter = new EnumAdapter<>(getContext(), Name.Suffix.class);
-        suffixPopup = new ListPopupWindow(getContext());
-        suffixPopup.setAdapter(suffixEnumAdapter);
-        suffixPopup.setAnchorView(suffixEditText);
-        suffixPopup.setOnItemClickListener((adapterView, view, i, l) -> {
-            suffixEditText.setText(suffixEnumAdapter.getItem(i).toString());
-            suffixPopup.dismiss();
+        suffixSpinner.setAdapter(suffixEnumAdapter);
+        suffixSpinner.setOnItemClickListener((adapterView, view, i, l) -> {
+            suffixSpinner.getEditText().setText(suffixEnumAdapter.getItem(i).toString());
+            suffixSpinner.dismiss();
         });
     }
 
@@ -157,8 +147,8 @@ protected void onAttachedToWindow() {
         subscriptions.add(Observable.combineLatest(RxTextView.afterTextChangeEvents(firstNameEditText),
                 RxTextView.afterTextChangeEvents(middleNameEditText),
                 RxTextView.afterTextChangeEvents(lastNameEditText),
-                RxTextView.afterTextChangeEvents(titleEditText),
-                RxTextView.afterTextChangeEvents(suffixEditText),
+                RxTextView.afterTextChangeEvents(titleSpinner.getEditText()),
+                RxTextView.afterTextChangeEvents(suffixSpinner.getEditText()),
                 (firstName, middleName, lastName, title, suffix) -> new Name.Builder()
                         .firstName(firstName.editable().toString())
                         .middleName(middleName.editable().toString())
@@ -173,16 +163,6 @@ protected void onAttachedToWindow() {
                 }));
     }
 
-    @OnClick(R.id.title_edittext)
-    public void onClickTitle(View v) {
-        titlePopup.show();
-    }
-
-    @OnClick(R.id.suffix_edittext)
-    public void onClickSuffix(View v){
-        suffixPopup.show();
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
diff --git a/app/src/main/java/com/rockthevote/grommet/util/EmailOrEmpty.java b/app/src/main/java/com/rockthevote/grommet/util/EmailOrEmpty.java
new file mode 100644
index 00000000..b225ed64
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/util/EmailOrEmpty.java
@@ -0,0 +1,19 @@
+package com.rockthevote.grommet.util;
+
+
+import com.mobsandgeeks.saripaar.annotation.ValidateUsing;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@ValidateUsing(EmailOrEmptyRule.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+
+public @interface EmailOrEmpty {
+    public int messageResId()   default -1;                     // Mandatory attribute
+    public String message()     default "Oops... too pricey";   // Mandatory attribute
+    public int sequence()       default -1;                     // Mandatory attribute
+}
diff --git a/app/src/main/java/com/rockthevote/grommet/util/EmailOrEmptyRule.java b/app/src/main/java/com/rockthevote/grommet/util/EmailOrEmptyRule.java
new file mode 100644
index 00000000..aa4acb15
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/util/EmailOrEmptyRule.java
@@ -0,0 +1,20 @@
+package com.rockthevote.grommet.util;
+
+import com.mobsandgeeks.saripaar.AnnotationRule;
+
+import commons.validator.routines.EmailValidator;
+
+public class EmailOrEmptyRule extends AnnotationRule<EmailOrEmpty, String> {
+
+    protected EmailOrEmptyRule(final EmailOrEmpty email) {
+        super(email);
+    }
+
+    @Override
+    public boolean isValid(final String email) {
+        if (Strings.isBlank(email)) {
+            return true;
+        }
+        return EmailValidator.getInstance(false).isValid(email);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rockthevote/grommet/util/KeyboardUtil.java b/app/src/main/java/com/rockthevote/grommet/util/KeyboardUtil.java
new file mode 100644
index 00000000..f802c526
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/util/KeyboardUtil.java
@@ -0,0 +1,51 @@
+
+package com.rockthevote.grommet.util;
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.support.design.widget.AppBarLayout;
+import android.view.View;
+import android.view.ViewTreeObserver;
+
+public class KeyboardUtil {
+
+    private View decorView;
+    private AppBarLayout appBarLayout;
+
+    public KeyboardUtil(Activity act, AppBarLayout appBarLayout) {
+        this.decorView = act.getWindow().getDecorView();
+        this.appBarLayout = appBarLayout;
+    }
+
+    public void enable() {
+        decorView.getViewTreeObserver().addOnGlobalLayoutListener(onGlobalLayoutListener);
+
+    }
+
+    public void disable() {
+        decorView.getViewTreeObserver().removeOnGlobalLayoutListener(onGlobalLayoutListener);
+    }
+
+    private ViewTreeObserver.OnGlobalLayoutListener onGlobalLayoutListener = new ViewTreeObserver.OnGlobalLayoutListener() {
+        boolean flag = true;
+
+        @Override
+        public void onGlobalLayout() {
+            Rect r = new Rect();
+            //r will be populated with the coordinates of your view that area still visible.
+            decorView.getWindowVisibleDisplayFrame(r);
+
+            //get screen height and calculate the difference with the useable area from the r
+            int height = decorView.getContext().getResources().getDisplayMetrics().heightPixels;
+            int diff = height - r.bottom;
+
+            //if it could be a keyboard collapse the appbarlayout
+            if (diff > 0 && flag) {
+                appBarLayout.setExpanded(false, true);
+                flag = false;
+            } else {
+                flag = true;
+            }
+        }
+    };
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/rockthevote/grommet/util/PhoneOrEmpty.java b/app/src/main/java/com/rockthevote/grommet/util/PhoneOrEmpty.java
new file mode 100644
index 00000000..edb8a296
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/util/PhoneOrEmpty.java
@@ -0,0 +1,19 @@
+package com.rockthevote.grommet.util;
+
+
+import com.mobsandgeeks.saripaar.annotation.ValidateUsing;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@ValidateUsing(PhoneOrEmptyRule.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+
+public @interface PhoneOrEmpty {
+    public int messageResId()   default -1;                     // Mandatory attribute
+    public String message()     default "Oops... too pricey";   // Mandatory attribute
+    public int sequence()       default -1;                     // Mandatory attribute
+}
diff --git a/app/src/main/java/com/rockthevote/grommet/util/PhoneOrEmptyRule.java b/app/src/main/java/com/rockthevote/grommet/util/PhoneOrEmptyRule.java
new file mode 100644
index 00000000..7c5ba9e1
--- /dev/null
+++ b/app/src/main/java/com/rockthevote/grommet/util/PhoneOrEmptyRule.java
@@ -0,0 +1,29 @@
+package com.rockthevote.grommet.util;
+
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.Phonenumber;
+import com.mobsandgeeks.saripaar.AnnotationRule;
+
+public class PhoneOrEmptyRule extends AnnotationRule<PhoneOrEmpty, String> {
+
+    protected PhoneOrEmptyRule(final PhoneOrEmpty email) {
+        super(email);
+    }
+
+    @Override
+    public boolean isValid(final String phone) {
+        if (Strings.isBlank(phone)) {
+            return true;
+        }
+        PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
+        Phonenumber.PhoneNumber number;
+        try {
+            number = phoneUtil.parse(phone, "US");
+        } catch (NumberParseException e) {
+            return false;
+        }
+        return PhoneNumberUtil.getInstance().isValidNumber(number);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/drop_down_arrow.xml b/app/src/main/res/drawable/drop_down_arrow.xml
new file mode 100644
index 00000000..5bc81c57
--- /dev/null
+++ b/app/src/main/res/drawable/drop_down_arrow.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="@color/colorPrimaryText"
+        android:pathData="M7,10L12,15L17,10H7Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_registration.xml b/app/src/main/res/layout/activity_registration.xml
index 3e4c7ab8..8caa7cf8 100644
--- a/app/src/main/res/layout/activity_registration.xml
+++ b/app/src/main/res/layout/activity_registration.xml
@@ -13,14 +13,16 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+
+        >
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/increment"
             android:background="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|enterAlways|snap"
+            app:layout_scrollFlags="scroll|snap"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
         <com.rockthevote.grommet.ui.misc.StepperTabLayout
@@ -37,7 +39,7 @@
     <android.support.v4.view.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
diff --git a/app/src/main/res/layout/fragment_additional_info.xml b/app/src/main/res/layout/fragment_additional_info.xml
index 2469999b..9ca014ff 100644
--- a/app/src/main/res/layout/fragment_additional_info.xml
+++ b/app/src/main/res/layout/fragment_additional_info.xml
@@ -12,51 +12,15 @@
     android:useDefaultMargins="true"
     >
 
-
     <TextView
-        android:layout_height="@dimen/list_item_height"
-        android:layout_marginStart="@dimen/content_margin"
-        android:gravity="bottom"
-        android:paddingBottom="@dimen/content_area_padding"
-        android:paddingTop="@dimen/content_area_padding"
-        android:text="@string/section_label_race"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        />
-
-    <Spinner
-        android:id="@+id/spinner_race"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/list_item_height"
-        android:layout_columnWeight="1"
-        android:layout_gravity="fill_horizontal|top"
+        android:layout_width="match_parent"
+        android:layout_columnSpan="2"
         android:layout_marginEnd="@dimen/content_margin"
-        android:layout_marginTop="11dp"
-        android:paddingBottom="@dimen/content_area_padding"
-        android:paddingTop="@dimen/content_area_padding"
-        />
-
-    <TextView
-        android:layout_height="@dimen/list_item_height"
         android:layout_marginStart="@dimen/content_margin"
-        android:gravity="bottom"
         android:paddingBottom="@dimen/content_area_padding"
         android:paddingTop="@dimen/content_area_padding"
-        android:text="@string/section_label_party"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        />
-
-
-    <Spinner
-        android:id="@+id/spinner_party"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/list_item_height"
-        android:layout_columnWeight="1"
-        android:layout_gravity="fill_horizontal|top"
-        android:layout_marginEnd="@dimen/content_margin"
-        android:layout_marginTop="11dp"
-        android:paddingBottom="@dimen/content_area_padding"
-        android:paddingTop="@dimen/content_area_padding"
-        />
+        android:text="@string/section_label_election_info"
+        android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/til_preferred_language"
@@ -80,6 +44,27 @@
 
     </android.support.design.widget.TextInputLayout>
 
+    <com.rockthevote.grommet.ui.misc.BetterSpinner
+        android:id="@+id/spinner_race"
+        android:layout_width="0dp"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginEnd="@dimen/content_margin"
+        android:layout_marginStart="@dimen/content_margin"
+        android:hint="@string/section_label_race"
+        app:errorEnabled="true"/>
+
+    <com.rockthevote.grommet.ui.misc.BetterSpinner
+        android:id="@+id/spinner_party"
+        android:layout_width="0dp"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginEnd="@dimen/content_margin"
+        android:layout_marginStart="@dimen/content_margin"
+        android:hint="@string/section_label_party"
+        app:errorEnabled="true"/>
+
+
     <CheckBox
         android:id="@+id/drivers_license_checkbox"
         android:layout_width="wrap_content"
@@ -105,10 +90,95 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/label_drivers_license_id"
-            android:inputType="date"
             android:maxLines="1"/>
 
     </android.support.design.widget.TextInputLayout>
 
+    <View
+        style="@style/GrommetDivider"
+        android:layout_width="0dp"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginStart="@dimen/content_margin"
+        android:paddingBottom="@dimen/content_area_padding"
+        android:paddingTop="@dimen/content_area_padding"/>
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_columnSpan="2"
+        android:layout_marginEnd="@dimen/content_margin"
+        android:layout_marginStart="@dimen/content_margin"
+        android:paddingBottom="@dimen/content_area_padding"
+        android:paddingTop="@dimen/content_area_padding"
+        android:text="@string/section_label_contact_info"
+        android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/til_email"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginEnd="@dimen/content_margin"
+        android:layout_marginStart="@dimen/content_margin"
+        app:errorEnabled="true">
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/email_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:layout_marginBottom="@dimen/content_area_padding"
+            android:hint="@string/label_email"
+            android:inputType="textEmailAddress"
+            android:maxLines="1"/>
+
+    </android.support.design.widget.TextInputLayout>
+
+    <CheckBox
+        android:id="@+id/email_opt_in"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_columnSpan="2"
+        android:layout_marginEnd="@dimen/content_margin"
+        android:layout_marginStart="@dimen/content_margin"
+        android:paddingBottom="@dimen/content_area_padding"
+        android:paddingTop="@dimen/content_area_padding"
+        android:text="@string/label_receive_email"/>
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/til_phone_number"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_columnWeight=".7"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginStart="@dimen/content_margin"
+        app:errorEnabled="true">
+
+        <android.support.design.widget.TextInputEditText
+            android:id="@+id/phone"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_item_height"
+            android:hint="@string/label_phone"
+            android:inputType="phone"
+            android:maxLines="1"/>
+
+    </android.support.design.widget.TextInputLayout>
+
+    <com.rockthevote.grommet.ui.misc.BetterSpinner
+        android:id="@+id/spinner_phone_type"
+        android:layout_width="0dp"
+        android:layout_columnWeight=".3"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginEnd="@dimen/content_margin"
+        android:hint="@string/label_phone_type"
+        app:errorEnabled="true"/>
+
+    <CheckBox
+        android:id="@+id/checkbox_can_receive_text"
+        style="@style/GrommetContentArea"
+        android:layout_width="wrap_content"
+        android:layout_columnSpan="2"
+        android:paddingBottom="@dimen/content_area_padding"
+        android:paddingTop="@dimen/content_area_padding"
+        android:text="@string/label_receive_text"/>
 </GridLayout>
diff --git a/app/src/main/res/layout/fragment_new_registrant.xml b/app/src/main/res/layout/fragment_new_registrant.xml
index ab27c360..aabd2f2e 100644
--- a/app/src/main/res/layout/fragment_new_registrant.xml
+++ b/app/src/main/res/layout/fragment_new_registrant.xml
@@ -3,46 +3,66 @@
 <LinearLayout
     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:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:animateLayoutChanges="true"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:orientation="vertical"
     android:paddingBottom="@dimen/detail_vertical_padding"
     android:paddingTop="@dimen/detail_vertical_padding">
 
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/text_input_layout_email"
+    <com.rockthevote.grommet.ui.views.NameView
+        android:id="@+id/name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="start|bottom"
+        app:name_type="CURRENT"/>
+
+    <CheckBox
+        android:id="@+id/name_changed"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/list_item_height"
         android:layout_marginStart="@dimen/content_margin"
-        app:errorEnabled="true">
+        android:text="@string/checkbox_name_changed"/>
 
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/edittext_email"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/list_item_height"
-            android:layout_marginBottom="@dimen/content_area_padding"
-            android:hint="@string/label_email"
-            android:inputType="textEmailAddress"
-            android:maxLines="1"/>
+    <View
+        android:id="@+id/previous_name_divider"
+        style="@style/GrommetDivider"
+        android:layout_width="match_parent"
+        android:visibility="gone"/>
 
-    </android.support.design.widget.TextInputLayout>
+    <com.rockthevote.grommet.ui.views.NameView
+        android:id="@+id/previous_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|bottom"
+        android:visibility="gone"
+        app:name_type="PREVIOUS"
+        tools:visibility="visible"/>
 
-    <CheckBox
-        android:id="@+id/email_opt_in"
+    <View
+        style="@style/GrommetDivider"
+        android:layout_width="match_parent"
+        android:paddingBottom="@dimen/content_area_padding"
+        android:paddingTop="@dimen/content_area_padding"/>
+
+    <TextView
+        android:id="@+id/textview_title"
         style="@style/GrommetContentArea"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="@dimen/content_area_padding"
         android:paddingTop="@dimen/content_area_padding"
-        android:text="@string/label_receive_email"/>
+        android:text="@string/section_label_eligibility"
+        android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/til_birthday"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/content_margin"
         android:layout_marginStart="@dimen/content_margin"
         app:errorEnabled="true"
         >
@@ -58,22 +78,6 @@
 
     </android.support.design.widget.TextInputLayout>
 
-    <View
-        style="@style/GrommetDivider"
-        android:layout_width="match_parent"
-        android:paddingBottom="@dimen/content_area_padding"
-        android:paddingTop="@dimen/content_area_padding"/>
-
-    <TextView
-        android:id="@+id/textview_title"
-        style="@style/GrommetContentArea"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/content_area_padding"
-        android:paddingTop="@dimen/content_area_padding"
-        android:text="@string/section_label_eligibility"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
-
     <CheckBox
         android:id="@+id/checkbox_is_us_citizen"
         style="@style/GrommetContentArea"
@@ -92,6 +96,5 @@
         android:paddingTop="@dimen/content_area_padding"
         android:text="@string/label_eighteen_or_older"/>
 
-
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_personal_info.xml b/app/src/main/res/layout/fragment_personal_info.xml
index 2fd99138..357fa7ca 100644
--- a/app/src/main/res/layout/fragment_personal_info.xml
+++ b/app/src/main/res/layout/fragment_personal_info.xml
@@ -11,54 +11,32 @@
     android:paddingBottom="@dimen/detail_vertical_padding"
     android:useDefaultMargins="false">
 
-    <com.rockthevote.grommet.ui.views.NameView
-        android:id="@+id/name"
+    <com.rockthevote.grommet.ui.views.AddressView
+        android:id="@+id/home_address"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_columnSpan="2"
         android:layout_gravity="start|bottom"
-        app:name_type="CURRENT"/>
+        app:address_type="REGISTRATION"/>
 
     <CheckBox
-        android:id="@+id/name_changed"
+        android:id="@+id/mailing_address_is_different"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/list_item_height"
         android:layout_columnSpan="2"
         android:layout_marginStart="@dimen/content_margin"
-        android:text="@string/checkbox_name_changed"/>
+        android:text="@string/checkbox_mailing_address_is_different"/>
 
     <View
-        android:id="@+id/previous_name_divider"
+        android:id="@+id/mailing_address_divider"
         style="@style/GrommetDivider"
         android:layout_width="match_parent"
         android:layout_columnSpan="2"
-        android:visibility="gone"/>
-
-    <com.rockthevote.grommet.ui.views.NameView
-        android:id="@+id/previous_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_columnSpan="2"
-        android:layout_gravity="start|bottom"
+        android:paddingBottom="@dimen/content_area_padding"
+        android:paddingTop="@dimen/content_area_padding"
         android:visibility="gone"
-        app:name_type="PREVIOUS"
-        tools:visibility="visible"/>
-
-    <com.rockthevote.grommet.ui.views.AddressView
-        android:id="@+id/home_address"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_columnSpan="2"
-        android:layout_gravity="start|bottom"
-        app:address_type="REGISTRATION"/>
-
-    <CheckBox
-        android:id="@+id/mailing_address_is_different"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/list_item_height"
-        android:layout_columnSpan="2"
-        android:layout_marginStart="@dimen/content_margin"
-        android:text="@string/checkbox_mailing_address_is_different"/>
+        tools:visibility="visible"
+        />
 
     <com.rockthevote.grommet.ui.views.AddressView
         android:id="@+id/mailing_address"
@@ -79,6 +57,17 @@
         android:layout_marginStart="@dimen/content_margin"
         android:text="@string/checkbox_address_changed"/>
 
+    <View
+        android:id="@+id/previous_address_divider"
+        style="@style/GrommetDivider"
+        android:layout_width="match_parent"
+        android:layout_columnSpan="2"
+        android:paddingBottom="@dimen/content_area_padding"
+        android:paddingTop="@dimen/content_area_padding"
+        android:visibility="gone"
+        tools:visibility="visible"
+        />
+
     <com.rockthevote.grommet.ui.views.AddressView
         android:id="@+id/previous_address"
         android:layout_width="match_parent"
@@ -90,63 +79,4 @@
         tools:visibility="visible"
         />
 
-    <View
-        style="@style/GrommetDivider"
-        android:layout_width="match_parent"
-        android:layout_columnSpan="2"/>
-
-    <TextView
-        style="@style/GrommetContentArea"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/title_height"
-        android:layout_columnSpan="2"
-        android:text="@string/section_label_phone"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        />
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/til_phone_number"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_columnWeight=".7"
-        android:layout_gravity="fill_horizontal"
-        android:layout_marginStart="@dimen/content_margin"
-        app:errorEnabled="true">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/phone"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/list_item_height"
-            android:hint="@string/label_phone"
-            android:inputType="phone"
-            android:maxLines="1"/>
-
-    </android.support.design.widget.TextInputLayout>
-
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/til_phone_type"
-        android:layout_width="0dp"
-        android:layout_columnWeight=".3"
-        android:layout_gravity="fill_horizontal"
-        android:layout_marginEnd="@dimen/content_margin"
-        android:hint="@string/label_phone_type"
-        app:errorEnabled="true">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/phone_type_edit_text"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/list_item_height"
-            android:cursorVisible="false"
-            android:focusable="false"
-            />
-
-    </android.support.design.widget.TextInputLayout>
-
-    <CheckBox
-        android:id="@+id/checkbox_can_receive_text"
-        style="@style/GrommetContentArea"
-        android:layout_width="wrap_content"
-        android:layout_columnSpan="2"
-        android:text="@string/label_receive_text"/>
-
 </GridLayout>
diff --git a/app/src/main/res/layout/fragment_registration_base.xml b/app/src/main/res/layout/fragment_registration_base.xml
index 36ecefbd..50192cb2 100644
--- a/app/src/main/res/layout/fragment_registration_base.xml
+++ b/app/src/main/res/layout/fragment_registration_base.xml
@@ -2,11 +2,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/personal_info_scrollview"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
         <android.support.v7.widget.CardView
             android:id="@+id/content_area"
diff --git a/app/src/main/res/layout/view_address.xml b/app/src/main/res/layout/view_address.xml
index 5cfba3da..107b3037 100644
--- a/app/src/main/res/layout/view_address.xml
+++ b/app/src/main/res/layout/view_address.xml
@@ -8,14 +8,6 @@
     android:columnCount="3"
     android:useDefaultMargins="false">
 
-    <View
-        style="@style/GrommetDivider"
-        android:layout_width="match_parent"
-        android:layout_columnSpan="3"
-        android:paddingBottom="@dimen/content_area_padding"
-        android:paddingTop="@dimen/content_area_padding"
-        />
-
     <TextView
         android:id="@+id/address_section_title"
         style="@style/GrommetContentArea"
@@ -64,25 +56,15 @@
 
     </android.support.design.widget.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/til_county"
+    <com.rockthevote.grommet.ui.misc.BetterSpinner
+        android:id="@+id/spinner_county"
         android:layout_width="0dp"
         android:layout_columnSpan="2"
         android:layout_gravity="fill_horizontal"
         android:layout_marginEnd="@dimen/content_margin"
         android:hint="@string/label_county"
-        app:errorEnabled="true">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/county_edit_text"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/list_item_height"
-            android:cursorVisible="false"
-            android:focusable="false"
-            android:maxLines="1"
-            />
-
-    </android.support.design.widget.TextInputLayout>
+        app:errorEnabled="true"
+        />
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/til_city"
@@ -103,23 +85,13 @@
 
     </android.support.design.widget.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.rockthevote.grommet.ui.misc.BetterSpinner
+        android:id="@+id/spinner_state"
         android:layout_width="0dp"
         android:layout_columnWeight=".3"
         android:layout_gravity="fill_horizontal"
         android:hint="@string/label_state"
-        app:errorEnabled="true">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/state_edit_text"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/list_item_height"
-            android:cursorVisible="false"
-            android:focusable="false"
-            android:maxLines="1"
-            />
-
-    </android.support.design.widget.TextInputLayout>
+        app:errorEnabled="true"/>
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/til_zip_code"
diff --git a/app/src/main/res/layout/view_name.xml b/app/src/main/res/layout/view_name.xml
index 804fede4..01d92cce 100644
--- a/app/src/main/res/layout/view_name.xml
+++ b/app/src/main/res/layout/view_name.xml
@@ -39,26 +39,14 @@
 
     </android.support.design.widget.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
-        android:id="@+id/til_title"
+    <com.rockthevote.grommet.ui.misc.BetterSpinner
+        android:id="@+id/spinner_title"
         android:layout_width="0dp"
         android:layout_columnWeight=".3"
         android:layout_gravity="fill_horizontal"
         android:layout_marginEnd="@dimen/content_margin"
         android:hint="@string/label_name_prefix"
-        app:errorEnabled="true">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/title_edittext"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/list_item_height"
-            android:cursorVisible="false"
-            android:focusable="false"
-            android:maxLines="1"
-            />
-
-    </android.support.design.widget.TextInputLayout>
-
+        app:errorEnabled="true"/>
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="0dp"
@@ -95,22 +83,13 @@
 
     </android.support.design.widget.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.rockthevote.grommet.ui.misc.BetterSpinner
+        android:id="@+id/spinner_suffix"
         android:layout_width="0dp"
+        android:layout_columnWeight=".3"
         android:layout_gravity="fill_horizontal"
         android:layout_marginEnd="@dimen/content_margin"
         android:hint="@string/label_name_suffix"
-        app:errorEnabled="true">
-
-        <android.support.design.widget.TextInputEditText
-            android:id="@+id/suffix_edittext"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/list_item_height"
-            android:cursorVisible="false"
-            android:focusable="false"
-            android:maxLines="1"
-            />
-
-    </android.support.design.widget.TextInputLayout>
+        app:errorEnabled="true"/>
 
 </GridLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5ec6f6f9..163338ab 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -25,4 +25,6 @@
     <dimen name="dialog_content_margin">40dp</dimen>
 
     <dimen name="signature_height">216dp</dimen>
+
+    <dimen name="alert_dialog_button_height">24dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
new file mode 100644
index 00000000..cea56521
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="titleId" type="id" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ac6defc..982139ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -96,13 +96,14 @@
     <string name="label_preferred_language">Preferred Language</string>
     <string name="label_has_drivers_license">I have my driver\'s license number</string>
     <string name="preferred_language_label">Preferred Language to Receive Election Materials</string>
+    <string name="section_label_election_info">Election Info</string>
 
     <!--Review and Confirm Fragment Strings-->
     <string name="fragment_title_review">Review</string>
     <string name="voter_agreement_text">I have reviewed the above information, and it is true and accurate to the best of my knowledge.</string>
     <string name="title_activity_settings">Settings</string>
     <string name="name_phrase_formatter">{title} {first_name} {middle_name} {last_name} {suffix}</string>
-    <string name="section_label_contact_info">Contact</string>
+    <string name="section_label_contact_info">Contact Info</string>
     <string name="review_confirm_instructions">Please review the following information and confirm its accuracy.</string>
     <string name="section_label_signature">Signature</string>
     <string name="signature_instructions">Please use stylus for signature capture</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9f3b6e13..f526c8d7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,7 +11,6 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-
         <item name="android:spinnerStyle">@android:style/Widget.Material.Spinner.Underlined</item>
     </style>
 
@@ -19,10 +18,6 @@
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
     </style>
 
-    <style name="Grommet.TextAppearance.Title" parent="@android:style/TextAppearance.Material.Title">
-        <item name="android:textColor">@color/colorPrimaryText</item>
-    </style>
-
     <style name="GrommetDatePickerDialog" parent="Theme.AppCompat.Light.Dialog">
         <item name="android:datePickerStyle">@style/GrommetDatePicker</item>
         <item name="colorAccent">@color/colorAccent</item>
diff --git a/build.gradle b/build.gradle
index 9fc0f9d4..a654129e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-alpha6'
+        classpath 'com.android.tools.build:gradle:2.2.0-beta1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.3') {
             // Workaround for https://github.com/stanfy/spoon-gradle-plugin/issues/33
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a8a9a863..4faeb961 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 07 15:47:31 EDT 2016
+#Thu Aug 11 11:48:10 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip