diff --git a/app/src/main/java/de/itstall/freifunkfranken/controller/NextApAdapter.java b/app/src/main/java/de/itstall/freifunkfranken/controller/NextApAdapter.java
index 43f6409f1f9e743ab9aead7fd84bbb2f0f18fc68..83e297b0a465d6fe857f41c939bae27a3d7e3ac9 100644
--- a/app/src/main/java/de/itstall/freifunkfranken/controller/NextApAdapter.java
+++ b/app/src/main/java/de/itstall/freifunkfranken/controller/NextApAdapter.java
@@ -56,9 +56,9 @@ public class NextApAdapter extends RecyclerView.Adapter<NextApAdapter.ViewHolder
 
         ViewHolder(View itemView) {
             super(itemView);
-            tvAp = itemView.findViewById(R.id.nextApSsid);
+            tvAp = itemView.findViewById(R.id.nextApTvSsid);
             tvStatus = itemView.findViewById(R.id.nextApTvStatus);
-            tvDistance = itemView.findViewById(R.id.nextApDistance);
+            tvDistance = itemView.findViewById(R.id.nextApTvDistance);
         }
     }
 }
diff --git a/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java b/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
index dea4f5a16797f4ca78a87076acb6e71c4a36cc78..a013afb230c8be9f0be1b780478ccb09977f3616 100644
--- a/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
+++ b/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
@@ -11,7 +11,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
@@ -37,7 +36,6 @@ import de.itstall.freifunkfranken.model.AccessPoint;
 public class NextApFragment extends Fragment {
     private RecyclerView rvAps;
     private View rootView;
-    private TextView tvTemp;
     private SharedPreferences sharedPreferences;
     public static Location location;
     private LocationManager locationManager;
@@ -55,7 +53,6 @@ public class NextApFragment extends Fragment {
 
         rvAps = rootView.findViewById(R.id.rvAps);
         rvAps.setLayoutManager(new LinearLayoutManager(getActivity()));
-        tvTemp = rootView.findViewById(R.id.tvTemp);
 
         locationManager = (LocationManager) rootView.getContext().getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
         Dexter.withActivity((Activity) rootView.getContext()).withPermission(Manifest.permission.ACCESS_FINE_LOCATION).withListener(new PermissionListener() {
@@ -87,6 +84,5 @@ public class NextApFragment extends Fragment {
         NextApAdapter nextApAdapter = new NextApAdapter(accessPointList);
         rvAps.setAdapter(nextApAdapter);
         rvAps.setItemAnimator(new DefaultItemAnimator());
-        tvTemp.setText(String.valueOf(accessPointList.size()));
     }
 }
diff --git a/app/src/main/res/layout/nextap_fragment.xml b/app/src/main/res/layout/nextap_fragment.xml
index e8e21828201a7ffad417dc29ed4b88c2fcf75c3e..20497972d1d333623b28d80de5c3c0ccb590b4a2 100644
--- a/app/src/main/res/layout/nextap_fragment.xml
+++ b/app/src/main/res/layout/nextap_fragment.xml
@@ -8,19 +8,11 @@
         android:id="@+id/rvAps"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/tvTemp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
     </androidx.recyclerview.widget.RecyclerView>
 
-    <TextView
-        android:id="@+id/tvTemp"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nextap_item.xml b/app/src/main/res/layout/nextap_item.xml
index cb81b1e046b8fc03cef178ec92a602fd686662ab..d44161b84e1135f3150d73228e17c857e26e310e 100644
--- a/app/src/main/res/layout/nextap_item.xml
+++ b/app/src/main/res/layout/nextap_item.xml
@@ -7,21 +7,21 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
+        android:layout_marginTop="5dp"
         android:layout_marginRight="5dp"
-        android:layout_weight="1">
+        android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/nextApSsid"
+            android:id="@+id/nextApTvSsid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
             android:layout_weight="4"
-            android:text="@string/tabSsids" />
+            android:textColor="@android:color/primary_text_light" />
 
         <TextView
-            android:id="@+id/nextApDistance"
+            android:id="@+id/nextApTvDistance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -30,11 +30,11 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:layout_marginBottom="5dp"
-        android:layout_weight="1">
+        android:orientation="horizontal">
 
         <TextView
             android:id="@+id/nextApTvStatusLabel"