diff --git a/res/layout/event_list.xml b/res/layout/event_list.xml
index 9acb594..7ff0cf6 100644
--- a/res/layout/event_list.xml
+++ b/res/layout/event_list.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent" android:layout_height="fill_parent">
-    <!-- Header -->
-    <include layout="@layout/header" android:id="@+id/header"
-		android:layout_height="80dip" android:layout_width="fill_parent" />
+	<!-- Header -->
+	<include 
+		layout="@layout/header"
+		android:id="@+id/header" 
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent" 
+		android:layout_alignParentTop="true" />
 
-	<!-- Program list (Added in Java.) -->
-	
 	<!-- Footer -->
-	<include layout="@layout/footer" android:id="@+id/footer" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:layout_alignParentBottom="true" />
+	<include 
+		layout="@layout/footer"
+		android:id="@+id/footer" 
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent" 
+		android:layout_alignParentBottom="true" />
+
+	<!-- Program list -->
+	<ListView android:id="@android:id/list"
+               android:layout_width="match_parent"
+               android:layout_height="match_parent"
+               android:layout_below="@id/header"
+               android:layout_above="@id/footer" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/com/studentersamfundet/app/ui/ProgramList.java b/src/com/studentersamfundet/app/ui/ProgramList.java
index 3caeb68..ba1190c 100644
--- a/src/com/studentersamfundet/app/ui/ProgramList.java
+++ b/src/com/studentersamfundet/app/ui/ProgramList.java
@@ -2,19 +2,17 @@ package com.studentersamfundet.app.ui;
 
 import org.w3c.dom.NodeList;
 
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.widget.ArrayAdapter;
+import android.widget.ListAdapter;
+import android.widget.Toast;
+
 import com.studentersamfundet.app.DataHandler;
 import com.studentersamfundet.app.FeedFetcher;
 import com.studentersamfundet.app.R;
 import com.studentersamfundet.app.XmlParser;
 
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.Toast;
-
 public class ProgramList extends ListActivity {
 	public static final String feedURL = "http://folk.uio.no/larsjeng/test.xml";
 	public static final String localURL = "/data/com.studentersamfundet.app/files/dns_events";
@@ -25,7 +23,7 @@ public class ProgramList extends ListActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // setContentView(R.layout.event_list);
+        setContentView(R.layout.event_list);
         
         // View v = this.findViewById(R.id.program_button);
         // v.setClickable(false);
@@ -43,14 +41,7 @@ public class ProgramList extends ListActivity {
         	Toast toast = Toast.makeText(this, R.string.error_noconnection_noupdate, Toast.LENGTH_LONG);
         	toast.show();
         }
-        
-        View header = getLayoutInflater().inflate(R.layout.header, null);
-        View footer = getLayoutInflater().inflate(R.layout.footer, null);
-        
-        ListView listView = getListView();
-        listView.addHeaderView(header);
-        listView.addFooterView(footer);
-        
+  
         ListAdapter adapter = createAdapter();
         setListAdapter(adapter);
     }