--- a/project_files/Android-build/SDL-android-project/res/layout/activity_netroom.xml	Mon Aug 06 22:33:07 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/activity_netroom.xml	Mon Aug 06 22:39:36 2012 +0200
@@ -26,14 +26,18 @@
                 android:id="@+id/mapFrame"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
                 android:layout_weight="1"
-                android:layout_marginRight="10dp"
                 android:background="@drawable/box" >
 
-                <!-- <fragment
+                <!--
+                     <fragment
                     android:id="@+id/mapFragment"
+                                    android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
                     class="org.hedgewars.hedgeroid.netplay.MapFragment"
-                    tools:layout="@layout/fragment_map" /> -->
+                    tools:layout="@layout/fragment_map" />
+                -->
             </FrameLayout>
 
             <FrameLayout
@@ -44,10 +48,14 @@
                 android:layout_weight="1"
                 android:background="@drawable/box" >
 
-               <!-- <fragment
+                <!--
+                    <fragment
                     android:id="@+id/settingsFragment"
+                                    android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
                     class="org.hedgewars.hedgeroid.netplay.SettingsFragment"
-                    tools:layout="@layout/fragment_settings" /> -->
+                    tools:layout="@layout/fragment_settings" />
+                -->
             </FrameLayout>
 
             <FrameLayout
@@ -57,11 +65,12 @@
                 android:layout_weight="1"
                 android:background="@drawable/box" >
 
-                <!-- <fragment
+                <fragment
                     android:id="@+id/teamsFragment"
-                    class="org.hedgewars.hedgeroid.netplay.TeamsFragment"
-                    tools:layout="@layout/fragment_teamlist" /> -->
-
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    class="org.hedgewars.hedgeroid.netplay.TeamlistFragment"
+                    tools:layout="@layout/fragment_teamlist" />
             </FrameLayout>
         </LinearLayout>
 
@@ -74,12 +83,12 @@
             android:layout_below="@id/upperFrame"
             android:background="@drawable/box" >
 
-            <!-- <fragment
+            <fragment
                 android:id="@+id/playerListFragment"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
-                class="org.hedgewars.hedgeroid.netplay.PlayerlistFragment"
-                tools:layout="@layout/lobby_players_fragment" /> -->
+                class="org.hedgewars.hedgeroid.netplay.RoomPlayerlistFragment"
+                tools:layout="@layout/fragment_playerlist" />
         </FrameLayout>
 
         <FrameLayout