diff --git a/src/com/upc/pbe/upcnews/Directoris.java b/src/com/upc/pbe/upcnews/Directoris.java
index e391f0d..7592790 100644
--- a/src/com/upc/pbe/upcnews/Directoris.java
+++ b/src/com/upc/pbe/upcnews/Directoris.java
@@ -22,7 +22,6 @@ public class Directoris extends Activity implements OnClickListener {
 	String folder = "Environment.getExternalStorageDirectory.getPath()";
 
 	ArrayList<Button> buttons = new ArrayList<Button>();
-	Button button1, button2, button3, button4;
 
 	public void onCreate(Bundle savedInstanceState) {
 
@@ -74,13 +73,13 @@ public class Directoris extends Activity implements OnClickListener {
 
 		case R.id.button1: {
 			Log.d(TAG, "Click on button1");
-			d = new Descarrega(url + "/" + button1.getText() + "/", file,
+			d = new Descarrega(url + "/" + buttons.get(0).getText() + "/", file,
 					folder);
 			String str = d.doInBackground();
 
 			HTMLParser pars = new HTMLParser();
-			String urlvideo = pars.findvideo((String) button1.getText(), str,
-					url + "/" + button1.getText() + "/");
+			String urlvideo = pars.findvideo((String) buttons.get(0).getText(), str,
+					url + "/" + buttons.get(0).getText() + "/");
 
 			Log.d(TAG, urlvideo);
 
@@ -104,24 +103,15 @@ public class Directoris extends Activity implements OnClickListener {
 
 	public void crearButtons() {
 
-		button1 = (Button) findViewById(R.id.button1);
-		button2 = (Button) findViewById(R.id.button2);
-		button3 = (Button) findViewById(R.id.button3);
-		button4 = (Button) findViewById(R.id.button4);
-
-		buttons.add(button1);
-		buttons.add(button2);
-		buttons.add(button3);
-		buttons.add(button4);
-
-		button1.setOnClickListener(this);
-		button2.setOnClickListener(this);
-		button3.setOnClickListener(this);
-		button4.setOnClickListener(this);
-
-		button1.setVisibility(View.GONE);
-		button2.setVisibility(View.GONE);
-		button3.setVisibility(View.GONE);
-		button4.setVisibility(View.GONE);
+
+		buttons.add((Button) findViewById(R.id.button1));
+		buttons.add((Button) findViewById(R.id.button2));
+		buttons.add((Button) findViewById(R.id.button3));
+		buttons.add((Button) findViewById(R.id.button4));
+
+		for(int i = 0; i < buttons.size(); i++){
+			buttons.get(i).setOnClickListener(this);
+			buttons.get(i).setVisibility(View.GONE);
+		}
 	}
 }
\ No newline at end of file