diff --git a/res/layout-sw580dp/external_group_editor_view.xml b/res/layout-sw580dp/external_group_editor_view.xml
new file mode 100644
index 0000000..39e0c56
--- /dev/null
+++ b/res/layout-sw580dp/external_group_editor_view.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="50dip"
+    android:paddingLeft="50dip"
+    android:paddingRight="100dip"
+    android:orientation="horizontal"
+    android:background="@color/background_primary">
+
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="3"
+        android:layout_marginRight="30dip"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/read_only_warning"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="10dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorTertiary"
+            android:text="@string/group_read_only" />
+
+        <include
+            android:id="@+id/account_header"
+            layout="@layout/editor_account_header"/>
+
+        <TextView
+            android:id="@+id/group_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textStyle="bold"
+            android:padding="10dip"/>
+
+    </LinearLayout>
+
+    <include
+        layout="@layout/group_editor_existing_member_list"
+        android:id="@android:id/list"
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="2"/>
+
+</LinearLayout>
diff --git a/res/layout-sw580dp/group_editor_fragment.xml b/res/layout-sw580dp/group_editor_view.xml
similarity index 64%
rename from res/layout-sw580dp/group_editor_fragment.xml
rename to res/layout-sw580dp/group_editor_view.xml
index bc41710..7874c8c 100644
--- a/res/layout-sw580dp/group_editor_fragment.xml
+++ b/res/layout-sw580dp/group_editor_view.xml
@@ -25,10 +25,33 @@
     android:background="@color/background_primary">
 
     <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="3"
+        android:layout_marginRight="30dip"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/account_header"
+            layout="@layout/editor_account_header"/>
+
+        <EditText
+            android:id="@+id/group_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textStyle="bold"
+            android:inputType="textCapWords"
+            android:hint="@string/group_name_hint"
+            android:layout_marginBottom="5dip"/>
+
+    </LinearLayout>
+
+    <LinearLayout
         android:id="@+id/group_members"
         android:layout_width="0dip"
         android:layout_height="match_parent"
-        android:layout_weight="1"
+        android:layout_weight="2"
         android:orientation="vertical">
 
         <include
@@ -41,8 +64,4 @@
 
     </LinearLayout>
 
-    <include
-        layout="@layout/group_editor_header"
-        android:id="@+id/header"/>
-
 </LinearLayout>
diff --git a/res/layout/group_editor_header.xml b/res/layout/group_editor_header.xml
deleted file mode 100644
index 9b8bf88..0000000
--- a/res/layout/group_editor_header.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-  Header for group editor that contains the account name, type, icon, as well
-  as the group name field.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_marginLeft="80dip"
-    android:orientation="vertical">
-
-    <include
-        layout="@layout/group_editor_account_header"
-        android:id="@+id/account_header"/>
-
-    <include
-        layout="@layout/edit_divider"
-        android:id="@+id/divider"/>
-
-    <EditText
-        android:id="@+id/group_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/group_name_hint"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:inputType="textCapWords"/>
-
-</LinearLayout>
\ No newline at end of file