diff --git a/res/drawable/gris.png b/res/drawable/gris.png
new file mode 100644
index 0000000..e37b660
Binary files /dev/null and b/res/drawable/gris.png differ
diff --git a/res/layout/event_view.xml b/res/layout/event_view.xml
index 7dae9cc..a44396f 100644
--- a/res/layout/event_view.xml
+++ b/res/layout/event_view.xml
@@ -32,7 +32,7 @@
 			android:layout_alignParentLeft="true" 
 			android:paddingLeft="5dp"
 			android:paddingRight="5dp" />
-			
+					
 		<TextView android:id="@+id/event_view_datetime" 
 	    	android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
 			android:layout_alignParentRight="true" 
 			android:paddingLeft="5dp"
 			android:paddingRight="5dp" />	
-	</RelativeLayout>	
+	</RelativeLayout>
 		
 	<Button android:id="@+id/event_view_link"
 		android:layout_width="match_parent"
@@ -59,6 +59,12 @@
 		<TextView android:id="@+id/event_view_description" 
 	    	android:layout_width="match_parent"
 			android:layout_height="wrap_content" />
+		
+		<ImageView 
+		    android:id="@+id/event_fb_icon"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:src="@drawable/fbicon" />
+		
 	</ScrollView>
-    
 </RelativeLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 1b6a643..da4bd0c 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -8,6 +8,7 @@
 		android:layout_width="match_parent" 
 		android:layout_alignParentTop="true"/>
 	
+	<!-- Picture size for buttons: 425x350 -->
 	<!-- MENU: --> 
 	<LinearLayout 
 	    android:layout_height="match_parent"
diff --git a/res/layout/main_tile_join.xml b/res/layout/main_tile_join.xml
index 41bdba2..d1b173a 100644
--- a/res/layout/main_tile_join.xml
+++ b/res/layout/main_tile_join.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_menu_join"
     style="@style/MetroTile"
-    android:background="@drawable/ex4"
+    android:background="@drawable/gris"
     android:onClick="joinButton" >
 
     <TextView
diff --git a/res/layout/main_tile_news.xml b/res/layout/main_tile_news.xml
index 0be1434..5234d44 100644
--- a/res/layout/main_tile_news.xml
+++ b/res/layout/main_tile_news.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_menu_news"
     style="@style/MetroTile"
-    android:background="@drawable/ex2"
+    android:background="@drawable/gris"
     android:onClick="newsButton" >
 
     <TextView
diff --git a/res/layout/main_tile_program.xml b/res/layout/main_tile_program.xml
index bd827fe..4beef8a 100644
--- a/res/layout/main_tile_program.xml
+++ b/res/layout/main_tile_program.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_menu_program"
     style="@style/MetroTile"
-    android:background="@drawable/ex1"
+    android:background="@drawable/gris"
     android:onClick="programButton" >
 
     <TextView
diff --git a/res/layout/main_tile_tickets.xml b/res/layout/main_tile_tickets.xml
index f19daf5..d0b9039 100644
--- a/res/layout/main_tile_tickets.xml
+++ b/res/layout/main_tile_tickets.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_menu_tickets"
     style="@style/MetroTile"
-    android:background="@drawable/ex3"
+    android:background="@drawable/gris"
     android:onClick="ticketButton" >
 
     <TextView
diff --git a/src/com/studentersamfundet/app/ui/EventViewActivity.java b/src/com/studentersamfundet/app/ui/EventViewActivity.java
index 5cac0b9..0569475 100644
--- a/src/com/studentersamfundet/app/ui/EventViewActivity.java
+++ b/src/com/studentersamfundet/app/ui/EventViewActivity.java
@@ -11,6 +11,7 @@ import android.text.util.Linkify;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -38,6 +39,7 @@ public class EventViewActivity extends BaseDnsActivity {
         TextView location = (TextView) findViewById(R.id.event_view_location);
         TextView datetime = (TextView) findViewById(R.id.event_view_datetime);
         Button link = (Button) findViewById(R.id.event_view_link);
+        ImageView fblink = (ImageView) findViewById(R.id.event_fb_icon);
         
         title.setText(Html.fromHtml(e.title));
         location.setText(Html.fromHtml(e.getLocation()));
diff --git a/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java b/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
index 3b1fa43..caef8a3 100644
--- a/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
+++ b/src/com/studentersamfundet/app/ui/lists/BaseListActivity.java
@@ -27,7 +27,6 @@ public abstract class BaseListActivity extends BaseDnsActivity {
 	private IParser parser;
 	
 	private boolean isUpdated = false;
-
 	
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/src/com/studentersamfundet/app/ui/lists/EventListActivity.java b/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
index cafc7bb..b7cc028 100644
--- a/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
+++ b/src/com/studentersamfundet/app/ui/lists/EventListActivity.java
@@ -136,6 +136,7 @@ public class EventListActivity extends BaseListActivity {
 				if (message.length < 1) 
 					message = new String[] { Event.ALL };
 				
+				currentCategory = message[0];
 				ListCreator<?> lc = getListCreator(EventListActivity.this, R.id.event_list, R.id.event_list_progress_bar);
 				lc.setCategory(message[0]);
 				lc.execute();
@@ -146,7 +147,7 @@ public class EventListActivity extends BaseListActivity {
 	    	Dialog dialog = new ChooseCategoryDialog(this, callback, getDataHandler().getEventCategories());
 	    	dialog.show();
     	} else {
-    		Toast.makeText(this, R.string.error_loading, Toast.LENGTH_SHORT);
+    		Toast.makeText(this, R.string.error_loading, Toast.LENGTH_SHORT).show();
     	}
     }
 
@@ -157,7 +158,7 @@ public class EventListActivity extends BaseListActivity {
 
 			@Override
 			protected Event[] getObjects() {
-				return getDataHandler().getEvents(Event.ALL);
+				return getDataHandler().getEvents(currentCategory);
 			}
     	};
     }