diff --git a/res/layout/app_ops_details_item.xml b/res/layout/app_ops_details_item.xml
index a0434fc1162..c630ad61a40 100644
--- a/res/layout/app_ops_details_item.xml
+++ b/res/layout/app_ops_details_item.xml
@@ -53,13 +53,14 @@
         android:id="@+id/op_time"
         android:layout_column="1"
         android:layout_row="1"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart" />
 
     <Switch android:id="@+id/switchWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_marginStart="8dip"
         android:layout_column="2"
         android:layout_row="0"
diff --git a/res/layout/app_ops_item.xml b/res/layout/app_ops_item.xml
index f42a8b9d672..8d214564f73 100644
--- a/res/layout/app_ops_item.xml
+++ b/res/layout/app_ops_item.xml
@@ -50,13 +50,14 @@
     <TextView
         android:id="@+id/op_name"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart" />
 
     <TextView
         android:id="@+id/op_time"
         android:layout_marginStart="8dip"
+        android:layout_gravity="top"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </GridLayout>
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index 8bdbadb66a3..f966d20d731 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -52,7 +52,7 @@
         android:id="@android:id/progress"
         android:layout_height="12dip"
         android:layout_columnSpan="2"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:layout_marginTop="4dip"
         android:max="100"
         android:progressDrawable="@drawable/data_usage_bar"
@@ -61,7 +61,7 @@
     <TextView
         android:id="@android:id/summary"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:layout_columnSpan="2"
         android:layout_marginTop="4dip"
         android:visibility="gone"
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index f471f5535e4..bf93840fb12 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -58,13 +58,14 @@
     <TextView
         android:id="@+id/app_size"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart" />
 
     <TextView
         android:id="@+id/app_disabled"
         android:layout_marginStart="8dip"
+        android:layout_gravity="top"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </GridLayout>
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index e64b5943267..52cecf640bb 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -62,7 +62,7 @@
 
     <LinearLayout
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal">
+        android:layout_gravity="fill_horizontal|top">
 
         <TextView
             android:id="@+id/description"
diff --git a/res/layout/title.xml b/res/layout/title.xml
index 0c2084b7a73..46b21150cc6 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -54,7 +54,7 @@
     <TextView
         android:id="@+id/provider_id"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 188cd30e89e..1f87b14d02f 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -91,12 +91,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements
         setHasOptionsMenu(true);
         addPreferencesFromResource(R.xml.vpn_settings2);
 
-        final boolean pickLockdown = getActivity()
-                .getIntent().getBooleanExtra(EXTRA_PICK_LOCKDOWN, false);
-        if (pickLockdown) {
-            LockdownConfigFragment.show(this);
-        }
-
         if (savedState != null) {
             VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"),
                     savedState.getByteArray("VpnProfile"));
@@ -162,6 +156,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements
     public void onResume() {
         super.onResume();
 
+        final boolean pickLockdown = getActivity()
+                .getIntent().getBooleanExtra(EXTRA_PICK_LOCKDOWN, false);
+        if (pickLockdown) {
+            LockdownConfigFragment.show(this);
+        }
+
         // Check KeyStore here, so others do not need to deal with it.
         if (!mKeyStore.isUnlocked()) {
             if (!mUnlocking) {