diff --git a/APED/app/src/main/java/com/example/aped/ui/visualization/MainListViewAdapter.java b/APED/app/src/main/java/com/example/aped/ui/visualization/MainListViewAdapter.java
index a88c63f..01c43d2 100644
--- a/APED/app/src/main/java/com/example/aped/ui/visualization/MainListViewAdapter.java
+++ b/APED/app/src/main/java/com/example/aped/ui/visualization/MainListViewAdapter.java
@@ -30,6 +30,10 @@ public class MainListViewAdapter extends BaseAdapter {
 
     private int favoriteImage;
 
+
+    List<String> favoritenList;
+
+
     public MainListViewAdapter(MainActivity pMainActivity,int pFavoriteMode){
         this.mainActivity = pMainActivity;
         this.favoriteMode = pFavoriteMode;
@@ -48,6 +52,7 @@ public class MainListViewAdapter extends BaseAdapter {
             devices = mainActivity.xml.getDeviceNames().size();
         }else{
             devices = mainActivity.favorite.getFavorites().size();
+            favoritenList = new ArrayList<>(mainActivity.favorite.getFavorites()) ;
         }
         return devices;
     }
@@ -92,10 +97,12 @@ public class MainListViewAdapter extends BaseAdapter {
                 new View.OnClickListener() {
                     @Override
                     public void onClick(final View view) {
+
                         if (favoriteMode == 0){
                             deviceName = mainActivity.xml.getDeviceNames().get(i);
                         }else{
-                            deviceName = mainActivity.favorite.getFavorites().get(i);
+                            List<String> test = favoritenList;
+                            deviceName = favoritenList.get(i);
                         }
                         if (mainActivity.favorite.getFavorites().contains(
                                 deviceName)) {
@@ -111,9 +118,9 @@ public class MainListViewAdapter extends BaseAdapter {
                             buttonViewFavoriten.setImageResource(
                                     favoriteImage);
                         }
-                        Intent intentneustart = mainActivity.getIntent();//                 gegen richtigen Befehl tauschen da nur die visualisierung neu gestartet werden soll
+                        /**Intent intentneustart = mainActivity.getIntent();//                 gegen richtigen Befehl tauschen da nur die visualisierung neu gestartet werden soll
                         mainActivity.finish();
-                        mainActivity.startActivity(intentneustart);
+                        mainActivity.startActivity(intentneustart);*/
                     }
                 });
         //textViewPin.setText(((List<String>) (mainActivity.xml.getPort(mainActivity.xml.getDeviceNames().get(i))).get("pins")).get(0));
diff --git a/APED/app/src/main/res/drawable/aped_logo.png b/APED/app/src/main/res/drawable/aped_logo.png
new file mode 100644
index 0000000..0219ae9
Binary files /dev/null and b/APED/app/src/main/res/drawable/aped_logo.png differ
diff --git a/APED/app/src/main/res/layout/nav_header_main.xml b/APED/app/src/main/res/layout/nav_header_main.xml
index c145545..f4ccd7e 100644
--- a/APED/app/src/main/res/layout/nav_header_main.xml
+++ b/APED/app/src/main/res/layout/nav_header_main.xml
@@ -1,35 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
     android:background="@drawable/side_nav_bar"
     android:gravity="bottom"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="110dp"
+        android:layout_height="100dp"
         android:contentDescription="@string/nav_header_desc"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@mipmap/ic_launcher_round" />
+        app:srcCompat="@drawable/aped_logo"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_margin="4dp"/>
 
     <TextView
+        android:id="@+id/textViewName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
         android:text="@string/nav_header_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:layout_below="@id/imageView"
+        android:layout_alignParentLeft="true"
+        android:layout_margin="4dp"/>
 
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/nav_header_subtitle" />
-</LinearLayout>
\ No newline at end of file
+        android:text="@string/nav_header_subtitle"
+        android:layout_below="@id/textViewName"
+        android:layout_alignParentLeft="true"
+        android:layout_margin="4dp"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/APED/app/src/main/res/values/dimens.xml b/APED/app/src/main/res/values/dimens.xml
index 4ab4520..bd926dc 100644
--- a/APED/app/src/main/res/values/dimens.xml
+++ b/APED/app/src/main/res/values/dimens.xml
@@ -3,6 +3,6 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="nav_header_vertical_spacing">8dp</dimen>
-    <dimen name="nav_header_height">176dp</dimen>
+    <dimen name="nav_header_height">210dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
 </resources>
\ No newline at end of file