diff --git a/APED/app/src/main/java/com/example/aped/ui/all_IOs/MainListViewAdapter.java b/APED/app/src/main/java/com/example/aped/ui/all_IOs/MainListViewAdapter.java
index ae8b46b..ebf6f4d 100644
--- a/APED/app/src/main/java/com/example/aped/ui/all_IOs/MainListViewAdapter.java
+++ b/APED/app/src/main/java/com/example/aped/ui/all_IOs/MainListViewAdapter.java
@@ -4,6 +4,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -14,6 +15,7 @@ import com.example.aped.R;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.LineNumberReader;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -55,8 +57,8 @@ public class MainListViewAdapter extends BaseAdapter {
                 null);
         TextView textViewName = (TextView) view.findViewById(
                 R.id.textName);
-        ListView listViewPin = (ListView) view.findViewById(
-                R.id.idListViewPins);
+        LinearLayout linearLayoutPin = (LinearLayout) view.findViewById(
+                R.id.idLinearLayoutPins);
         ImageView buttonViewFavoriten = (ImageView) view.findViewById(
                 R.id.imageButtonFavoriten);
 
@@ -99,8 +101,10 @@ public class MainListViewAdapter extends BaseAdapter {
                     for(String pinName: ((List<String>)mainActivity.xml.getPort(mainActivity.xml.getDeviceNames().get(i)).get("pins"))){
                         pinValues.add(state.getString(pinName));
                     }
-                    PinListViewAdapter pinListViewAdapter = new PinListViewAdapter(mainActivity,mainActivity.xml.getDeviceNames().get(i), pinValues);
-                    listViewPin.setAdapter(pinListViewAdapter);
+                    PinView pinView = new PinView(mainActivity,mainActivity.xml.getDeviceNames().get(i), pinValues);
+                    for(int j = 0; j < ((List<String>)mainActivity.xml.getPort(mainActivity.xml.getDeviceNames().get(i)).get("pins")).size(); j++) {
+                        linearLayoutPin.addView(pinView.getView(j));
+                    }
                 } catch (JSONException e) {
                                                                 // Richtigen log erstellen
                     e.printStackTrace();
diff --git a/APED/app/src/main/java/com/example/aped/ui/all_IOs/PinListViewAdapter.java b/APED/app/src/main/java/com/example/aped/ui/all_IOs/PinView.java
similarity index 54%
rename from APED/app/src/main/java/com/example/aped/ui/all_IOs/PinListViewAdapter.java
rename to APED/app/src/main/java/com/example/aped/ui/all_IOs/PinView.java
index ede8e61..547c37d 100644
--- a/APED/app/src/main/java/com/example/aped/ui/all_IOs/PinListViewAdapter.java
+++ b/APED/app/src/main/java/com/example/aped/ui/all_IOs/PinView.java
@@ -2,21 +2,15 @@ package com.example.aped.ui.all_IOs;
 
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
 import android.widget.ImageView;
-import android.widget.ListView;
 import android.widget.TextView;
 
-import com.android.volley.Response;
 import com.example.aped.MainActivity;
 import com.example.aped.R;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.List;
 
-public class PinListViewAdapter extends BaseAdapter {
+public class PinView {
     private MainActivity mainActivity;
 
     private int image;
@@ -24,35 +18,14 @@ public class PinListViewAdapter extends BaseAdapter {
     private  String deviceName;
 
 
-    public PinListViewAdapter(MainActivity pMainActivity,String pdevice, List<String> ppinValues){
+    public PinView(MainActivity pMainActivity,String pDevice, List<String> pPinValues){
         this.mainActivity = pMainActivity;
-        this.deviceName = pdevice;
-        this.pinValues = ppinValues;
+        this.deviceName = pDevice;
+        this.pinValues = pPinValues;
     }
 
-
-    @Override
-    public int getCount() {
-        int tempsize = pinValues.size();
-        return pinValues.size();
-    }
-
-    @Override
-    public Object getItem(final int position) {
-
-        return null;
-    }
-
-    @Override
-    public long getItemId(final int position) {
-
-        return 0;
-    }
-
-    @Override
-    public View getView(final int i, View view,
-                        final ViewGroup viewGroup) {
-        view = mainActivity.getLayoutInflater().inflate(R.layout.pin_listview_layout,
+    public View getView(final int i) {
+        View view = mainActivity.getLayoutInflater().inflate(R.layout.pin_listview_layout,
                 null);
         ImageView imageView = (ImageView) view.findViewById(
                 R.id.images);
diff --git a/APED/app/src/main/res/layout/listview_layout.xml b/APED/app/src/main/res/layout/listview_layout.xml
index 3808e35..1e691fd 100644
--- a/APED/app/src/main/res/layout/listview_layout.xml
+++ b/APED/app/src/main/res/layout/listview_layout.xml
@@ -27,13 +27,14 @@
         android:layout_margin="2dp"
         app:srcCompat="@android:drawable/btn_star_big_on" />
 
-    <ListView
-        android:id="@+id/idListViewPins"
+    <LinearLayout
+        android:id="@+id/idLinearLayoutPins"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
         android:layout_toLeftOf="@id/imageButtonFavoriten"
-        android:layout_below="@id/textName"/>
+        android:layout_below="@id/textName"
+        android:orientation="vertical" />
 
 
 </RelativeLayout>
\ No newline at end of file