diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 1118617b..bc110806 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-09-30T17:07:48.228901900Z">
+        <DropdownSelection timestamp="2024-10-02T14:53:51.057673200Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Georgios Seimenis\.android\avd\Pixel_4a_API_33.avd" />
diff --git a/app/build.gradle b/app/build.gradle
index a473f686..55403f7a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.georgemc2610.benzinapp"
         minSdk 28
         targetSdk 33
-        versionCode 16
-        versionName "v0.5.3-alpha"
+        versionCode 17
+        versionName "v0.5.4-alpha"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/georgemc2610/benzinapp/activity_display/ActivityDisplayMalfunction.java b/app/src/main/java/com/georgemc2610/benzinapp/activity_display/ActivityDisplayMalfunction.java
index 4c99f464..b4cb2ec5 100644
--- a/app/src/main/java/com/georgemc2610/benzinapp/activity_display/ActivityDisplayMalfunction.java
+++ b/app/src/main/java/com/georgemc2610/benzinapp/activity_display/ActivityDisplayMalfunction.java
@@ -21,6 +21,8 @@
 import com.georgemc2610.benzinapp.activity_maps.MapsDisplayPointActivity;
 import com.georgemc2610.benzinapp.R;
 import com.georgemc2610.benzinapp.classes.activity_tools.DisplayActionBarTool;
+import com.georgemc2610.benzinapp.classes.activity_tools.NightModeTool;
+import com.georgemc2610.benzinapp.classes.activity_tools.ViewTools;
 import com.georgemc2610.benzinapp.classes.original.Malfunction;
 import com.georgemc2610.benzinapp.classes.requests.DataHolder;
 import com.georgemc2610.benzinapp.classes.requests.RequestHandler;
@@ -90,7 +92,7 @@ private void assignViewValues()
 
         // Set "status" depending on the actual status.
         statusView.setText(malfunction.getEnded() == null? getText(R.string.card_view_malfunction_ongoing) : getText(R.string.card_view_malfunction_fixed));
-        statusView.setTextColor(malfunction.getEnded() == null? getColor(R.color.dark_red) : getColor(R.color.dark_green));
+        statusView.setTextColor(malfunction.getEnded() == null? NightModeTool.getRedColor(this) : NightModeTool.getGreenColor(this));
 
         // Set Card Visibility depending on the malfunction's status.
         fixedData.setVisibility(malfunction.getEnded() == null? View.GONE : View.VISIBLE);
diff --git a/app/src/main/java/com/georgemc2610/benzinapp/activity_display/ActivityDisplayRepeatedTrip.java b/app/src/main/java/com/georgemc2610/benzinapp/activity_display/ActivityDisplayRepeatedTrip.java
index bb1c3e4e..12d3629e 100644
--- a/app/src/main/java/com/georgemc2610/benzinapp/activity_display/ActivityDisplayRepeatedTrip.java
+++ b/app/src/main/java/com/georgemc2610/benzinapp/activity_display/ActivityDisplayRepeatedTrip.java
@@ -56,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState)
         title = findViewById(R.id.display_repeated_trip_text_view_title);
         timesRepeating = findViewById(R.id.display_repeated_trip_text_view_times_repeating);
         trip = findViewById(R.id.display_repeated_trip_text_view_from_origin_to_destination);
-        CardView showOnMapButton = findViewById(R.id.display_repeated_trip_button_show_on_map);
+        Button showOnMapButton = findViewById(R.id.display_repeated_trip_button_show_on_map);
         Button deleteButton = findViewById(R.id.buttonDelete);
         Button editButton = findViewById(R.id.buttonEdit);
         km = findViewById(R.id.display_repeated_trip_text_view_total_km);
diff --git a/app/src/main/java/com/georgemc2610/benzinapp/classes/original/Car.java b/app/src/main/java/com/georgemc2610/benzinapp/classes/original/Car.java
index 5d857170..92efb043 100644
--- a/app/src/main/java/com/georgemc2610/benzinapp/classes/original/Car.java
+++ b/app/src/main/java/com/georgemc2610/benzinapp/classes/original/Car.java
@@ -101,6 +101,20 @@ public void calculateAverages()
         averageKilometersPerLiter = kilometerSum / literSum;
     }
 
+    public boolean anyCostPresent()
+    {
+        if (!DataHolder.getInstance().records.isEmpty())
+            return true;
+
+        if (!DataHolder.getInstance().malfunctions.isEmpty())
+            return true;
+
+        if (!DataHolder.getInstance().services.isEmpty())
+            return true;
+
+        return false;
+    }
+
     // -- GETTERS -- //
     public String getUsername()
     {
diff --git a/app/src/main/java/com/georgemc2610/benzinapp/fragments/history/HistoryFragment.java b/app/src/main/java/com/georgemc2610/benzinapp/fragments/history/HistoryFragment.java
index 4bdb2109..657d1232 100644
--- a/app/src/main/java/com/georgemc2610/benzinapp/fragments/history/HistoryFragment.java
+++ b/app/src/main/java/com/georgemc2610/benzinapp/fragments/history/HistoryFragment.java
@@ -2,11 +2,13 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -42,8 +44,9 @@ public class HistoryFragment extends Fragment
     FloatingActionButton ButtonAdd;
     ImageView image;
     LinearLayout scrollViewLayout;
+    ScrollView mainLayout, noDataLayout;
     LayoutInflater inflater;
-    TextView hint, totalFuelFillRecords;
+    TextView hint, totalFuelFillRecords, noDataLabel;
 
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
     {
@@ -60,27 +63,44 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
         // image view can have its visibility revoked if there are no entries.
         image = root.findViewById(R.id.image_view_records_nothing);
+        noDataLabel = root.findViewById(R.id.text_view_no_data);
 
         // scrollview layout for the cards.
         scrollViewLayout = root.findViewById(R.id.historyFragment_linearLayoutScrollView);
+        mainLayout = root.findViewById(R.id.scrollView2);
+        noDataLayout = root.findViewById(R.id.scroll_view_no_records);
         this.inflater = getLayoutInflater();
 
         // text view with total fuel fill records
         totalFuelFillRecords = root.findViewById(R.id.text_view_history_total_fuel_fill_records);
 
+        return root;
+    }
+
+    private void updateAfterCountLogic()
+    {
         if (DataHolder.getInstance().records.isEmpty())
         {
             image.setVisibility(View.VISIBLE);
+            noDataLabel.setVisibility(View.VISIBLE);
+            noDataLayout.setVisibility(View.VISIBLE);
+
+            mainLayout.setVisibility(View.GONE);
             totalFuelFillRecords.setVisibility(View.GONE);
-            hint.setVisibility(View.GONE);
-            scrollViewLayout.setVisibility(View.GONE);
+            hint.setVisibility(View.INVISIBLE);
+
+            return;
         }
-        else if (DataHolder.getInstance().records.size() == 1)
+
+        totalFuelFillRecords.setVisibility(View.VISIBLE);
+        hint.setVisibility(View.VISIBLE);
+
+        if (DataHolder.getInstance().records.size() == 1)
             totalFuelFillRecords.setText(R.string.text_view_one_record);
         else
             totalFuelFillRecords.setText(DataHolder.getInstance().records.size() + getString(R.string.text_view_total_records));
 
-        return root;
+        createCards();
     }
 
     private void createCards()
@@ -213,6 +233,6 @@ public void onDestroyView()
     public void onResume()
     {
         super.onResume();
-        createCards();
+        updateAfterCountLogic();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/georgemc2610/benzinapp/fragments/home/HomeFragment.java b/app/src/main/java/com/georgemc2610/benzinapp/fragments/home/HomeFragment.java
index 43df4c6c..46a05ce5 100644
--- a/app/src/main/java/com/georgemc2610/benzinapp/fragments/home/HomeFragment.java
+++ b/app/src/main/java/com/georgemc2610/benzinapp/fragments/home/HomeFragment.java
@@ -1,5 +1,6 @@
 package com.georgemc2610.benzinapp.fragments.home;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -7,13 +8,17 @@
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
 import androidx.fragment.app.Fragment;
 
 import com.georgemc2610.benzinapp.R;
+import com.georgemc2610.benzinapp.activity_add.ActivityAddRecord;
 import com.georgemc2610.benzinapp.classes.activity_tools.NightModeTool;
 import com.georgemc2610.benzinapp.classes.original.FuelFillRecord;
 import com.georgemc2610.benzinapp.classes.original.Malfunction;
@@ -47,10 +52,13 @@ public class HomeFragment extends Fragment
 {
 
     TextView car, year, avg_ltPer100Km, avg_KmPerLt, avg_CostPerKm;
+    Button startExploring;
     Spinner spinner;
+    LinearLayout mainLayout;
     LineChart lineChart;
     PieChart pieChart;
     DecimalFormat format;
+    CardView pieChartCardView;
     LineData lineDataLtPer100, lineDataKmPerLt, lineDataCostPerKm;
     LineDataSet lineDataSetLtPer100, lineDataSetKmPerLt, lineDataSetCostPerKm;
     ArrayList<Entry> entriesLtPer100, entriesKmPerLt, entriesCostPerKm;
@@ -65,11 +73,17 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         // get views
         car = root.findViewById(R.id.textView_Car);
         year = root.findViewById(R.id.textView_Year);
+        mainLayout = root.findViewById(R.id.main_linear_layout);
         avg_CostPerKm = root.findViewById(R.id.textView_AVG_CostPerKm);
         avg_ltPer100Km = root.findViewById(R.id.textView_AVG_LtPer100Km);
         avg_KmPerLt = root.findViewById(R.id.textView_AVG_KmPerLt);
         lineChart = root.findViewById(R.id.graph);
         pieChart = root.findViewById(R.id.pie_chart_costs);
+        startExploring = root.findViewById(R.id.start_exploring);
+        pieChartCardView = root.findViewById(R.id.pie_chart_costs_card);
+
+        // start exploring button clicked
+        startExploring.setOnClickListener(this::onStartExploringButtonClicked);
 
         // decimal formatter
         format = new DecimalFormat("#.##");
@@ -116,12 +130,43 @@ public void onNothingSelected(AdapterView<?> parent)
         });
 
         SetCarInfo();
-        SetGraphView();
-        setPieChartView();
+
+        // create the cards based on the car records
+        showCorrectCardsForNoRecordsYet();
 
         return root;
     }
 
+    private void showCorrectCardsForNoRecordsYet()
+    {
+        // combined costs might still occur, as there might be services or malfunctions
+        if (!DataHolder.getInstance().car.anyCostPresent())
+            pieChartCardView.setVisibility(View.GONE);
+        else
+            setPieChartView();
+
+        // hide all graphs and consumption related cards based on the records' presence
+        if (DataHolder.getInstance().records.isEmpty())
+        {
+            for (int i = 0; i < mainLayout.getChildCount(); i++)
+            {
+                View child = mainLayout.getChildAt(i);
+                if (child.getTag() == null) continue;
+                child.setVisibility(child.getTag().toString().equals("yes_data") ? View.GONE : View.VISIBLE);
+            }
+
+            return;
+        }
+
+        SetGraphView();
+    }
+
+    private void onStartExploringButtonClicked(View v)
+    {
+        Intent intent = new Intent(getContext(), ActivityAddRecord.class);
+        startActivity(intent);
+    }
+
     @Override
     public void onDestroyView()
     {
@@ -313,8 +358,12 @@ private void setPieChartView()
         pieChart.setDescription(description);
 
         // put to pie chart data
-        for (String type: costAmountMap.keySet())
-            pieEntries.add(new PieEntry(costAmountMap.get(type), type));
+        /*for (String type: costAmountMap.keySet())
+            pieEntries.add(new PieEntry(costAmountMap.get(type), type));*/
+
+        pieEntries.add(new PieEntry(fuelCosts, getString(R.string.pie_chart_fuel)));
+        pieEntries.add(new PieEntry(malfunctionCosts, getString(R.string.pie_chart_malfunctions)));
+        pieEntries.add(new PieEntry(serviceCosts, getString(R.string.pie_chart_services)));
 
         PieDataSet pieDataSet = new PieDataSet(pieEntries, "");
         pieDataSet.setValueTextSize(14f);
diff --git a/app/src/main/java/com/georgemc2610/benzinapp/fragments/repeated_trips/RepeatedTripsFragment.java b/app/src/main/java/com/georgemc2610/benzinapp/fragments/repeated_trips/RepeatedTripsFragment.java
index 79b7d323..922dd41c 100644
--- a/app/src/main/java/com/georgemc2610/benzinapp/fragments/repeated_trips/RepeatedTripsFragment.java
+++ b/app/src/main/java/com/georgemc2610/benzinapp/fragments/repeated_trips/RepeatedTripsFragment.java
@@ -9,6 +9,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.georgemc2610.benzinapp.R;
@@ -31,6 +32,7 @@ public class RepeatedTripsFragment extends Fragment
     private FragmentRepeatedTripsBinding binding;
     private FloatingActionButton buttonAddTrip;
     private LinearLayout linearLayout;
+    private ScrollView mainScrollView, noDataScrollView;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
@@ -45,13 +47,22 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         // get scroll view to add the cards.
         linearLayout = root.findViewById(R.id.repeated_trips_fragment_linearLayoutScrollView);
+        mainScrollView = root.findViewById(R.id.scrollView2);
+        noDataScrollView = root.findViewById(R.id.scrollViewNoData);
 
         return root;
     }
 
-
     private void createCards()
     {
+        // display the related image if there are no trips.
+        if (DataHolder.getInstance().trips.isEmpty())
+        {
+            mainScrollView.setVisibility(View.GONE);
+            noDataScrollView.setVisibility(View.VISIBLE);
+            return;
+        }
+
         // calculate averages
         DataHolder.getInstance().car.calculateAverages();
 
diff --git a/app/src/main/java/com/georgemc2610/benzinapp/fragments/services/ServicesFragment.java b/app/src/main/java/com/georgemc2610/benzinapp/fragments/services/ServicesFragment.java
index 1495fa0b..0885153c 100644
--- a/app/src/main/java/com/georgemc2610/benzinapp/fragments/services/ServicesFragment.java
+++ b/app/src/main/java/com/georgemc2610/benzinapp/fragments/services/ServicesFragment.java
@@ -36,7 +36,7 @@ public class ServicesFragment extends Fragment implements TabLayout.OnTabSelecte
 
     private FragmentServicesBinding binding;
     private TabLayout tabLayout;
-    private ScrollView servicesScrollView, malfunctionsScrollView;
+    private ScrollView servicesScrollView, noDataServicesScrollView, malfunctionsScrollView, noDataMalfunctionsScrollView;
     private LinearLayout servicesLinearLayout, malfunctionsLinearLayout;
     private LayoutInflater inflater;
     private FloatingActionButton buttonAddService;
@@ -55,6 +55,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         // Get the other scroll views.
         servicesScrollView = root.findViewById(R.id.scroll_view_services);
         malfunctionsScrollView = root.findViewById(R.id.scroll_view_malfunctions);
+        noDataMalfunctionsScrollView = root.findViewById(R.id.scroll_view_malfunctions_no_data);
+        noDataServicesScrollView = root.findViewById(R.id.scroll_view_services_no_data);
 
         // button add service
         buttonAddService = root.findViewById(R.id.button_add_service);
@@ -68,6 +70,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         tabLayout.addOnTabSelectedListener(this);
         tabLayout.selectTab(tabLayout.getTabAt(0));
 
+        // this must be done, even though we call the function above
+        servicesScrollView.setVisibility(View.GONE);
+        noDataServicesScrollView.setVisibility(View.GONE);
+
+        boolean noMalfunctions = DataHolder.getInstance().malfunctions.isEmpty();
+        noDataMalfunctionsScrollView.setVisibility(noMalfunctions ? View.VISIBLE : View.GONE);
+        malfunctionsScrollView.setVisibility(noMalfunctions ? View.GONE : View.VISIBLE);
+
         return root;
     }
 
@@ -211,11 +221,20 @@ public void onTabSelected(TabLayout.Tab tab)
         {
             case 0:
                 servicesScrollView.setVisibility(View.GONE);
-                malfunctionsScrollView.setVisibility(View.VISIBLE);
+                noDataServicesScrollView.setVisibility(View.GONE);
+
+                boolean noMalfunctions = DataHolder.getInstance().malfunctions.isEmpty();
+                noDataMalfunctionsScrollView.setVisibility(noMalfunctions ? View.VISIBLE : View.GONE);
+                malfunctionsScrollView.setVisibility(noMalfunctions ? View.GONE : View.VISIBLE);
                 break;
             case 1:
-                servicesScrollView.setVisibility(View.VISIBLE);
                 malfunctionsScrollView.setVisibility(View.GONE);
+                noDataMalfunctionsScrollView.setVisibility(View.GONE);
+
+                boolean noServices = DataHolder.getInstance().services.isEmpty();
+                noDataServicesScrollView.setVisibility(noServices ? View.VISIBLE : View.GONE);
+                servicesScrollView.setVisibility(noServices ? View.GONE : View.VISIBLE);
+
                 break;
             default:
                 throw new UnsupportedOperationException();
diff --git a/app/src/main/res/drawable/car_service_icon.xml b/app/src/main/res/drawable/car_service_icon.xml
new file mode 100644
index 00000000..f00bbfd1
--- /dev/null
+++ b/app/src/main/res/drawable/car_service_icon.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="122.88dp"
+    android:height="90.57dp"
+    android:viewportWidth="122.88"
+    android:viewportHeight="90.57">
+  <path
+      android:fillColor="#393939"
+      android:pathData="M0,56.71C0.51,53.84 2,52.07 4.8,52a12.06,12.06 0,0 1,1.62 -7.6,11.24 11.24,0 0,1 2.34,-2.6c3.3,-2.68 7,-3 11.1,-3.71s7.89,-1.32 11.84,-1.78c4.77,-0.57 9.54,-0.94 14.31,-1.08 2.21,-0.06 1.68,0.06 3.43,-1.29l0.06,0L28.42,13.54c-2.71,-2.82 -4.86,-3.07 -8.46,-3l-1.93,0A6,6 0,0 1,14.13 7l-0.54,-1.84c-0.38,-1.28 -0.54,-1.81 0.38,-3C15.41,0.23 18.18,0.14 20.38,0c4.45,-0.23 8,0.93 11.42,5.29L54.91,29.89A162.56,162.56 0,0 1,77.16 17.11a24.7,24.7 0,0 1,6.6 -2.06,22.52 22.52,0 0,0 0.5,3.5c-3.17,0.52 -4.87,1.23 -9.18,3.52 -4.81,2.55 -9.2,5.36 -13.87,8.41 -1,0.64 -2,1.3 -2.92,2v5.81h28L82.63,52.33l-0.28,0.92 -0.42,0.35c-0.69,0.62 -1.48,1.25 -2.44,2a6.42,6.42 0,0 0,-0.6 0.42A25.91,25.91 0,0 0,68.7 71.34l-0.09,0.43L50.15,71.77c3.87,-17.8 -7.64,-25 -18.21,-24C18.34,49.09 14.76,60 17.09,72L5.31,72C2,72.13 0.39,69.45 0,64.92L0,56.71ZM104.25,84.71a16.36,16.36 0,0 1,-11.43 5.88C104.08,77.66 86.25,66.46 80.35,84c-4.89,-7.36 -2.44,-15.31 4.27,-20.32 3.16,-2.36 4.81,-3.73 5.83,-5.34a11.35,11.35 0,0 0,1.28 -3L97.52,33c2.31,-8.27 -9.07,-16.21 -1.11,-26.56A16.36,16.36 0,0 1,107.84 0.55c-11.27,12.91 6.57,24.11 12.47,6.58 4.89,7.36 2.44,15.31 -4.27,20.32 -3,2.19 -6,3.23 -7.47,8.84l-5.43,21.56a11.6,11.6 0,0 0,-0.44 3.72,13.08 13.08,0 0,0 0.85,3.47c2.48,7.08 6,12.7 0.7,19.65ZM35.32,59v4.87h4.87A6.66,6.66 0,0 0,35.32 59ZM40.19,67L35.32,67v4.87A6.66,6.66 0,0 0,40.19 67ZM32.19,71.87L32.19,67L27.28,67a6.66,6.66 0,0 0,4.87 4.87ZM27.32,63.87h4.87L32.19,59a6.67,6.67 0,0 0,-4.87 4.87ZM33.78,51.94A13.52,13.52 0,1 1,20.22 65.45,13.51 13.51,0 0,1 33.74,51.94Z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/check_engine_icon.xml b/app/src/main/res/drawable/check_engine_icon.xml
new file mode 100644
index 00000000..f158de4e
--- /dev/null
+++ b/app/src/main/res/drawable/check_engine_icon.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="122.88dp"
+    android:height="94.59dp"
+    android:viewportWidth="122.88"
+    android:viewportHeight="94.59">
+  <path
+      android:fillColor="#393939"
+      android:pathData="M43.58,92.2L31.9,80.53h-8.04c-2.81,0 -5.11,-2.3 -5.11,-5.11v-8.7h-4.87V76.9c0,2.17 -1.78,3.95 -3.95,3.95H3.95C1.78,80.85 0,79.07 0,76.9V42.4c0,-2.17 1.78,-3.95 3.95,-3.95h5.98c2.17,0 3.95,1.78 3.95,3.95v10.18h4.87v-9.36c0,-2.81 2.3,-5.11 5.11,-5.11h8.54l12.07,-12.83c1.4,-1.22 3.26,-1.65 5.43,-1.56h49.73c1.72,0.19 3.03,0.85 3.83,2.09c0.8,1.22 0.67,1.91 0.67,3.28v23.49H109V42.4c0,-2.17 1.78,-3.95 3.95,-3.95h5.98c2.17,0 3.95,1.78 3.95,3.95v34.5c0,2.17 -1.78,3.95 -3.95,3.95h-5.98c-2.17,0 -3.95,-1.78 -3.95,-3.95V66.72h-4.87v0.92c0,2.73 0.08,4.38 -1.66,6.64c-0.33,0.43 -0.7,0.84 -1.11,1.22L83.53,92.96c-0.89,0.99 -2.24,1.53 -4.02,1.63h-30.4C46.84,94.49 44.99,93.71 43.58,92.2L43.58,92.2zM63.71,61.78l-12.64,-1.19l10.48,-22.96h14.33l-8.13,13.17l14.62,1.62L55.53,84.64L63.71,61.78L63.71,61.78zM51.98,0h34.5c2.17,0 3.95,1.78 3.95,3.95v5.98c0,2.17 -1.78,3.95 -3.95,3.95H76.3v5.03H62.16v-5.03H51.98c-2.17,0 -3.95,-1.78 -3.95,-3.95V3.95C48.03,1.78 49.81,0 51.98,0L51.98,0z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/no_petrol_icon.xml b/app/src/main/res/drawable/no_petrol_icon.xml
new file mode 100644
index 00000000..f6488e9c
--- /dev/null
+++ b/app/src/main/res/drawable/no_petrol_icon.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="114.84dp"
+    android:height="122.88dp"
+    android:viewportWidth="114.84"
+    android:viewportHeight="122.88">
+  <path
+      android:pathData="M28.21,66.46c15.58,0 28.21,12.63 28.21,28.21s-12.63,28.21 -28.21,28.21C12.63,122.88 0,110.25 0,94.67S12.64,66.46 28.21,66.46L28.21,66.46L28.21,66.46zM34.54,81.51c1.64,-1.67 4.31,-1.67 5.96,-0.02c1.65,1.66 1.66,4.35 0.02,6.02l-7.2,7.3l7.21,7.31c1.63,1.65 1.6,4.33 -0.05,5.98c-1.65,1.65 -4.31,1.65 -5.94,-0.01l-7.16,-7.26l-7.17,7.27c-1.64,1.67 -4.31,1.67 -5.96,0.02c-1.65,-1.66 -1.66,-4.35 -0.02,-6.02l7.2,-7.3l-7.21,-7.31c-1.63,-1.65 -1.6,-4.33 0.05,-5.98c1.65,-1.65 4.31,-1.65 5.94,0.01l7.16,7.26L34.54,81.51L34.54,81.51L34.54,81.51z"
+      android:fillColor="#D8453E"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M104.79,17.15c0.23,0.11 0.43,0.25 0.63,0.44c0.05,0.05 0.09,0.1 0.14,0.15c2.45,1.94 4.91,4.14 6.69,6.79c1.97,2.93 3.06,6.32 2.4,10.33c-0.28,1.68 -0.92,3.15 -1.88,4.45c-0.7,0.93 -1.54,1.74 -2.55,2.45c-0.05,1.3 -0.07,2.57 -0.07,3.84c0.01,1.62 0.06,3.29 0.15,5.01c0.21,4.02 0.81,8.08 1.42,12.11c0.64,4.33 1.29,8.62 1.46,13.1c0.23,5.73 -0.45,10.44 -2.34,13.77c-2.11,3.72 -5.53,5.7 -10.57,5.53l0,0c-6.02,-0.11 -9.72,-3.49 -11.39,-9.73c-1.46,-5.46 -1.24,-13.25 0.42,-23.06c-0.05,-7.77 -1.06,-13.65 -3.06,-17.61c-1.31,-2.59 -3.08,-4.3 -5.32,-5.12v50.86c0.73,0.35 1.39,0.82 1.95,1.39c1.29,1.29 2.1,3.08 2.1,5.05v5.08c0,1.28 -1.04,2.33 -2.33,2.33H63.56c0.45,-1.51 0.8,-3.06 1.06,-4.64h15.69v-2.75c0,-0.68 -0.28,-1.3 -0.73,-1.76c-0.23,-0.23 -0.5,-0.41 -0.8,-0.53l0,0c-0.07,0.01 -0.13,0.01 -0.19,0.01H65.1c0.01,-0.33 0.01,-0.66 0.01,-1c0,-1.31 -0.07,-2.6 -0.2,-3.87h10.3c0,-25.82 0,-50.54 0,-76.33c0,-2.12 -0.87,-4.06 -2.28,-5.46c-1.4,-1.4 -3.34,-2.28 -5.46,-2.28H37.5c-2.11,0 -4.02,0.87 -5.42,2.26c-1.39,1.39 -2.26,3.31 -2.26,5.42v42.86c-0.36,-0.01 -0.3,-0.02 -1.08,-0.02s-3.44,0.06 -4.61,0.17V12.33c0,-3.4 1.38,-6.48 3.62,-8.71C29.98,1.38 33.06,0 36.46,0h32.07c3.4,0 6.5,1.39 8.74,3.63c2.24,2.24 3.63,5.34 3.63,8.75v22.38c4.13,0.9 7.28,3.54 9.47,7.87c2.35,4.64 3.52,11.3 3.56,19.91c0,0.14 -0.01,0.27 -0.03,0.4h0.01c-1.57,9.23 -1.83,16.43 -0.53,21.24c1.08,4.05 3.35,6.24 7,6.29h0.04l0,0c3.11,0.1 5.17,-1.04 6.38,-3.18c1.43,-2.53 1.94,-6.41 1.74,-11.3c-0.16,-4.14 -0.8,-8.36 -1.43,-12.61c-0.61,-4.09 -1.22,-8.22 -1.45,-12.55c-0.09,-1.71 -0.14,-3.45 -0.15,-5.25c-0.01,-1.43 0.02,-2.84 0.08,-4.22c-4.34,-3.8 -6.98,-7.61 -7.79,-11.39c-0.77,-3.59 0.04,-7.04 2.55,-10.33c-1.91,-1.31 -3.85,-2.38 -5.82,-3.23c-2.69,-1.17 -5.46,-1.96 -8.28,-2.42c-1.26,-0.2 -2.12,-1.4 -1.92,-2.67c0.2,-1.27 1.4,-2.12 2.67,-1.92c3.19,0.52 6.32,1.41 9.39,2.74C99.26,13.43 102.07,15.07 104.79,17.15L104.79,17.15L104.79,17.15zM40.26,11.66h24.99c1.3,0 2.48,0.53 3.33,1.38c0.06,0.06 0.12,0.12 0.17,0.19c0.76,0.84 1.21,1.94 1.21,3.14v15.94c0,1.3 -0.53,2.48 -1.38,3.33c-0.85,0.85 -2.03,1.38 -3.33,1.38H40.26c-1.29,0 -2.46,-0.53 -3.32,-1.38l-0.01,0.01c-0.85,-0.85 -1.38,-2.03 -1.38,-3.33V16.37c0,-1.3 0.53,-2.48 1.38,-3.33c0.06,-0.06 0.12,-0.12 0.19,-0.17C37.96,12.12 39.06,11.66 40.26,11.66L40.26,11.66L40.26,11.66zM104.02,22.5c-1.62,2.17 -2.16,4.35 -1.69,6.54c0.57,2.65 2.55,5.47 5.84,8.45c0.33,-0.3 0.63,-0.61 0.87,-0.94c0.52,-0.69 0.87,-1.49 1.01,-2.41c0.44,-2.68 -0.31,-4.98 -1.67,-7C107.26,25.44 105.7,23.9 104.02,22.5L104.02,22.5L104.02,22.5z"
+      android:fillColor="#393939"/>
+</vector>
diff --git a/app/src/main/res/drawable/repeated_trips_icon.xml b/app/src/main/res/drawable/repeated_trips_icon.xml
new file mode 100644
index 00000000..1ed7e976
--- /dev/null
+++ b/app/src/main/res/drawable/repeated_trips_icon.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="109.69dp"
+    android:height="122.88dp"
+    android:viewportWidth="109.69"
+    android:viewportHeight="122.88">
+  <path
+      android:fillColor="#393939"
+      android:pathData="M101.41,37.05c-1.95,2.14 -4.22,4.05 -6.77,5.6c-0.31,0.23 -0.74,0.26 -1.09,0.03c-3.76,-2.39 -6.93,-5.27 -9.41,-8.4c-3.43,-4.3 -5.59,-9.07 -6.33,-13.66c-0.75,-4.66 -0.05,-9.14 2.27,-12.79C81,6.4 82.17,5.08 83.59,3.95c3.27,-2.6 7,-3.98 10.73,-3.95c3.58,0.03 7.12,1.36 10.18,4.15c1.08,0.98 1.98,2.09 2.72,3.31c2.49,4.11 3.03,9.34 1.93,14.65C108.07,27.36 105.39,32.69 101.41,37.05L101.41,37.05L101.41,37.05zM9.82,64.7h8.72c1.45,0 2.57,0.36 3.35,1.08c0.78,0.72 1.17,1.61 1.17,2.67c0,0.89 -0.28,1.66 -0.83,2.29c-0.37,0.43 -0.91,0.76 -1.62,1.01c1.08,0.26 1.88,0.7 2.39,1.34c0.51,0.63 0.76,1.43 0.76,2.39c0,0.78 -0.18,1.48 -0.54,2.11c-0.36,0.62 -0.86,1.12 -1.49,1.48c-0.39,0.22 -0.98,0.39 -1.77,0.49c-1.05,0.14 -1.74,0.21 -2.09,0.21H9.82V64.7L9.82,64.7zM14.51,70.62h2.03c0.73,0 1.23,-0.13 1.52,-0.38c0.28,-0.25 0.43,-0.61 0.43,-1.09c0,-0.44 -0.14,-0.78 -0.43,-1.03c-0.28,-0.25 -0.78,-0.37 -1.49,-0.37h-2.06V70.62L14.51,70.62zM14.51,76.53h2.37c0.8,0 1.37,-0.14 1.7,-0.43c0.33,-0.28 0.49,-0.66 0.49,-1.14c0,-0.45 -0.16,-0.8 -0.49,-1.07c-0.33,-0.27 -0.9,-0.41 -1.71,-0.41h-2.36V76.53L14.51,76.53zM96.62,21.82h-5.27l-0.76,2.48h-4.75l5.67,-15.07h5.1l5.65,15.07h-4.87L96.62,21.82L96.62,21.82zM95.64,18.56l-1.64,-5.41l-1.65,5.41H95.64L95.64,18.56zM23.88,92.06c-1.95,2.14 -4.22,4.05 -6.77,5.6c-0.31,0.23 -0.74,0.26 -1.09,0.03c-3.76,-2.4 -6.93,-5.27 -9.41,-8.4C3.19,85 1.03,80.23 0.29,75.63c-0.75,-4.66 -0.05,-9.14 2.27,-12.78c0.91,-1.44 2.08,-2.75 3.51,-3.88c3.27,-2.6 7,-3.98 10.72,-3.95c3.58,0.03 7.12,1.36 10.18,4.15c1.08,0.98 1.98,2.09 2.72,3.31c2.49,4.11 3.03,9.34 1.93,14.65C30.54,82.37 27.86,87.7 23.88,92.06L23.88,92.06L23.88,92.06zM17.07,103.04c4.51,0 8.32,3.02 9.52,7.14h59.97c2.96,0 5.66,-1.21 7.62,-3.17c1.96,-1.96 3.17,-4.65 3.17,-7.62l0,0c0,-2.96 -1.21,-5.66 -3.17,-7.62c-1.96,-1.96 -4.65,-3.17 -7.62,-3.17H65.58v0c-4.71,0 -8.99,-1.92 -12.09,-5.02c-3.1,-3.1 -5.02,-7.38 -5.02,-12.09l0,0c0,-4.71 1.92,-8.99 5.02,-12.09c3.1,-3.1 7.38,-5.02 12.09,-5.02h18.97c1.3,-3.96 5.03,-6.82 9.42,-6.82c5.48,0 9.92,4.44 9.92,9.92c0,5.48 -4.44,9.92 -9.92,9.92c-4.35,0 -8.04,-2.8 -9.38,-6.69H65.58c-2.96,0 -5.66,1.21 -7.62,3.17c-1.96,1.96 -3.17,4.65 -3.17,7.62l0,0c0,2.96 1.21,5.66 3.17,7.62c1.94,1.94 4.61,3.15 7.55,3.17v0h21.06c4.71,0 8.99,1.92 12.09,5.02c3.1,3.1 5.02,7.38 5.02,12.09l0,0c0,4.71 -1.92,8.99 -5.02,12.09c-3.1,3.1 -7.38,5.02 -12.09,5.02H26.34c-1.43,3.73 -5.04,6.37 -9.27,6.37c-5.48,0 -9.92,-4.44 -9.92,-9.92C7.15,107.48 11.59,103.04 17.07,103.04L17.07,103.04z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_add_record.xml b/app/src/main/res/layout/activity_add_record.xml
index 82f946aa..97f40118 100644
--- a/app/src/main/res/layout/activity_add_record.xml
+++ b/app/src/main/res/layout/activity_add_record.xml
@@ -56,6 +56,7 @@
                     android:hint="@string/edit_text_cost_hint"
                     style="@style/genericField"
                     android:textSize="15sp"
+                    android:layout_marginHorizontal="2dp"
                     android:padding="11dp"
                     android:inputType="numberDecimal"
                     android:id="@+id/cost" />
diff --git a/app/src/main/res/layout/activity_add_repeated_trip.xml b/app/src/main/res/layout/activity_add_repeated_trip.xml
index 7f92330b..26f63e2b 100644
--- a/app/src/main/res/layout/activity_add_repeated_trip.xml
+++ b/app/src/main/res/layout/activity_add_repeated_trip.xml
@@ -92,10 +92,11 @@
                     android:layout_weight="1"
                     app:cornerRadius="55dp"
                     style="@style/buttonMainBackground"
+                    android:autoSizeTextType="uniform"
                     android:layout_marginEnd="5dp"
+                    android:autoSizeMaxTextSize="20sp"
                     android:text="@string/button_repeated_trips_make_trip"
-                    android:letterSpacing="0"
-                    android:textSize="15sp" />
+                    android:letterSpacing="0" />
 
                 <!-- BUTTON PICK DATE -->
                 <Button
@@ -105,10 +106,11 @@
                     app:cornerRadius="55dp"
                     style="@style/buttonDeleteBackground"
                     android:layout_weight="1"
+                    android:autoSizeTextType="uniform"
+                    android:autoSizeMaxTextSize="20sp"
                     android:layout_marginStart="5dp"
                     android:text="@string/button_remove_trip"
-                    android:letterSpacing="0"
-                    android:textSize="20sp" />
+                    android:letterSpacing="0" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_display_repeated_trip.xml b/app/src/main/res/layout/activity_display_repeated_trip.xml
index 964bc677..90677faa 100644
--- a/app/src/main/res/layout/activity_display_repeated_trip.xml
+++ b/app/src/main/res/layout/activity_display_repeated_trip.xml
@@ -328,42 +328,19 @@
                         android:textStyle="bold" />
 
                     <!-- SHOW ON MAP BUTTON -->
-                    <androidx.cardview.widget.CardView
+                    <Button
                         android:id="@+id/display_repeated_trip_button_show_on_map"
                         android:layout_width="match_parent"
-                        android:layout_height="45dp"
+                        android:layout_height="55dp"
                         android:layout_marginBottom="10dp"
+                        android:autoSizeMaxTextSize="18sp"
+                        android:autoSizeTextType="uniform"
+                        android:gravity="center"
+                        android:letterSpacing="0.02"
+                        android:text="@string/display_trip_show_on_map"
                         app:cardCornerRadius="50dp"
-                        app:cardBackgroundColor="@color/main"
-                        android:padding="12dp"
-                        android:gravity="center">
-
-                        <RelativeLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent">
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignStart="@+id/showOnMapText"
-                                android:layout_centerVertical="true"
-                                android:layout_marginStart="-80dp"
-                                android:background="@android:drawable/ic_dialog_map"
-                                android:backgroundTint="@color/white" />
-
-                            <TextView
-                                android:id="@+id/showOnMapText"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:layout_centerVertical="true"
-                                android:text="@string/display_trip_show_on_map"
-                                android:textColor="@color/white"
-                                android:textSize="16sp" />
-
-                        </RelativeLayout>
-
-                    </androidx.cardview.widget.CardView>
+                        app:cornerRadius="65dp"
+                        app:icon="@android:drawable/ic_dialog_map" />
 
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/activity_display_service.xml b/app/src/main/res/layout/activity_display_service.xml
index 7f4bbbf3..91d31835 100644
--- a/app/src/main/res/layout/activity_display_service.xml
+++ b/app/src/main/res/layout/activity_display_service.xml
@@ -24,8 +24,7 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
+                android:layout_marginHorizontal="10dp"
                 style="@style/cardMainBackground"
                 android:layout_marginTop="10dp"
                 android:layout_marginBottom="15dp"
@@ -35,6 +34,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
                     android:orientation="vertical">
 
                     <!-- DATE HAPPENED -->
@@ -43,8 +43,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/textColorSpecial"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginStart="10dp"
                         android:text="@string/text_view_service_date_happened"
                         android:textSize="12sp" />
 
@@ -53,7 +51,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/textColorSpecial"
-                        android:layout_marginStart="10dp"
                         android:text="@string/loading"
                         android:textSize="24sp"
                         android:textStyle="bold" />
@@ -63,9 +60,8 @@
                         android:id="@+id/text_view_display_service_legend_at_km"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
                         style="@style/textColorSpecial"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginStart="10dp"
                         android:text="@string/text_view_service_at_km"
                         android:textSize="12sp" />
 
@@ -75,8 +71,6 @@
                         android:layout_height="wrap_content"
                         style="@style/textColorSpecial"
                         android:text="@string/loading"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginBottom="10dp"
                         android:textSize="24sp"
                         android:textStyle="bold" />
 
@@ -87,9 +81,8 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
+                android:layout_marginHorizontal="10dp"
                 android:layout_marginBottom="5dp"
-                android:layout_marginEnd="10dp"
                 style="@style/cardMainBackground"
                 app:cardCornerRadius="10dp"
                 app:cardElevation="5dp">
@@ -97,6 +90,8 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="10dp"
+                    android:layout_marginVertical="5dp"
                     android:orientation="vertical">
 
                     <!-- DESCRIPTION -->
@@ -105,8 +100,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/textColorSpecial"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginTop="5dp"
                         android:fontFamily="sans-serif-black"
                         android:textSize="24sp"
                         android:text="@string/text_view_description" />
@@ -117,9 +110,7 @@
                         android:layout_height="wrap_content"
                         style="@style/textColorSpecial"
                         android:text="@string/loading"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="15dp"
+                        android:layout_marginVertical="5dp"
                         android:textSize="14sp"
                         android:fontFamily="sans-serif" />
 
@@ -128,18 +119,17 @@
 
             <!-- LAYOUT FOR BOTH CARDS -->
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:gravity="center">
 
                 <!-- CARD FOR MILEAGE + COST DATA -->
                 <androidx.cardview.widget.CardView
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginBottom="20dp"
+                    android:layout_marginVertical="10dp"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="5dp"
                     style="@style/cardMainBackground"
@@ -149,6 +139,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:layout_margin="7dp"
                         android:orientation="vertical">
 
                         <!-- COST EUR -->
@@ -157,8 +148,6 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             style="@style/textColorSpecial"
-                            android:layout_marginTop="5dp"
-                            android:layout_marginStart="5dp"
                             android:text="@string/text_view_cost"
                             android:textSize="12sp" />
 
@@ -168,7 +157,6 @@
                             android:layout_height="wrap_content"
                             style="@style/textColorSpecial"
                             android:text="@string/loading"
-                            android:layout_marginStart="5dp"
                             android:textSize="24sp"
                             android:textStyle="bold" />
 
@@ -179,7 +167,6 @@
                             android:layout_height="wrap_content"
                             style="@style/textColorSpecial"
                             android:layout_marginTop="10dp"
-                            android:layout_marginStart="5dp"
                             android:text="@string/text_view_service_next_at"
                             android:textSize="12sp" />
 
@@ -189,20 +176,19 @@
                             android:layout_height="wrap_content"
                             style="@style/textColorSpecial"
                             android:text="@string/loading"
-                            android:layout_marginStart="5dp"
                             android:layout_marginBottom="10dp"
                             android:textSize="24sp"
                             android:textStyle="bold" />
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
 
+                <!-- LOCATION CARDVIEW -->
                 <androidx.cardview.widget.CardView
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:layout_marginStart="5dp"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginBottom="20dp"
+                    android:layout_marginVertical="10dp"
                     android:layout_marginEnd="10dp"
                     style="@style/cardMainBackground"
                     app:cardCornerRadius="10dp"
@@ -211,6 +197,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_margin="7dp"
                         android:orientation="vertical">
 
                         <!-- LOCATION -->
@@ -219,8 +206,6 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             style="@style/textColorSpecial"
-                            android:layout_marginTop="5dp"
-                            android:layout_marginStart="5dp"
                             android:text="@string/text_view_location"
                             android:textSize="12sp" />
 
@@ -230,8 +215,6 @@
                             android:layout_height="wrap_content"
                             style="@style/textColorSpecial"
                             android:text="@string/loading"
-                            android:layout_marginStart="5dp"
-                            android:layout_marginBottom="10dp"
                             android:textSize="18sp"
                             android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/activity_edit_malfunction.xml b/app/src/main/res/layout/activity_edit_malfunction.xml
index 4f651a86..091a322a 100644
--- a/app/src/main/res/layout/activity_edit_malfunction.xml
+++ b/app/src/main/res/layout/activity_edit_malfunction.xml
@@ -78,7 +78,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="WARNING: By unchecking, you will mark this Malfunction as ongoing again."
+                android:text="@string/malfunction_edit_warning"
                 android:layout_marginTop="10dp"
                 android:textSize="15sp"
                 android:visibility="invisible"
@@ -120,7 +120,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Select date fixed..."
+                android:text="@string/malfunction_select_date_fixed"
                 android:tag="additional"
                 android:visibility="gone"
                 android:layout_marginTop="25dp"
@@ -146,11 +146,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="55dp"
                     android:layout_weight="1"
+                    android:autoSizeTextType="uniform"
                     style="@style/selectDateFixed"
                     android:layout_marginEnd="3dp"
                     android:text="@string/button_select_date"
                     android:letterSpacing="0"
-                    android:textSize="18sp" />
+                    android:autoSizeMaxTextSize="18sp" />
 
                 <!-- BUTTON PICK DATE -->
                 <Button
@@ -160,10 +161,11 @@
                     android:layout_height="55dp"
                     android:layout_weight="1"
                     style="@style/selectTodayFixed"
+                    android:autoSizeTextType="uniform"
                     android:layout_marginStart="3dp"
                     android:text="@string/button_select_todays_date"
                     android:letterSpacing="0"
-                    android:textSize="18sp" />
+                    android:autoSizeMaxTextSize="18sp" />
 
             </LinearLayout>
 
@@ -199,9 +201,10 @@
                     android:layout_marginEnd="3dp"
                     android:text="@string/button_select_location"
                     android:letterSpacing="0"
+                    android:autoSizeTextType="uniform"
                     style="@style/selectToday"
                     app:cornerRadius="55dp"
-                    android:textSize="18sp" />
+                    android:autoSizeMaxTextSize="20sp" />
 
                 <!-- BUTTON DELETE LOCATION -->
                 <Button
@@ -210,11 +213,12 @@
                     android:layout_height="55dp"
                     android:layout_weight="1"
                     android:layout_marginStart="3dp"
+                    android:autoSizeTextType="uniform"
                     style="@style/deleteButton"
                     android:text="@string/button_delete_location"
                     app:cornerRadius="55dp"
                     android:letterSpacing="0"
-                    android:textSize="16sp" />
+                    android:autoSizeMaxTextSize="20sp" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_edit_record.xml b/app/src/main/res/layout/activity_edit_record.xml
index 9a57639c..13b49aef 100644
--- a/app/src/main/res/layout/activity_edit_record.xml
+++ b/app/src/main/res/layout/activity_edit_record.xml
@@ -64,7 +64,7 @@
 
                 <!-- COST -->
                 <LinearLayout
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical">
@@ -75,11 +75,12 @@
                         android:text="@string/text_view_cost" />
 
                     <EditText
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/edit_text_cost_hint"
                         style="@style/genericField"
                         android:textSize="15sp"
+                        android:layout_marginHorizontal="2dp"
                         android:padding="11dp"
                         android:inputType="numberDecimal"
                         android:id="@+id/cost" />
@@ -87,7 +88,7 @@
 
                 <!-- MILEAGE -->
                 <LinearLayout
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical">
@@ -98,7 +99,7 @@
                         android:text="@string/text_view_kilometers" />
 
                     <EditText
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/edit_text_kilometers_hint"
                         style="@style/genericField"
@@ -124,7 +125,7 @@
                 android:layout_marginTop="30dp" />
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="horizontal"
                 android:layout_marginTop="5dp"
@@ -132,7 +133,7 @@
 
                 <!-- LT -->
                 <EditText
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:hint="@string/edit_text_petrol_type_hint"
@@ -145,7 +146,7 @@
 
                 <!-- COST -->
                 <EditText
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:hint="@string/edit_text_station_hint"
diff --git a/app/src/main/res/layout/activity_edit_repeated_trip.xml b/app/src/main/res/layout/activity_edit_repeated_trip.xml
index 189761ab..21ff170b 100644
--- a/app/src/main/res/layout/activity_edit_repeated_trip.xml
+++ b/app/src/main/res/layout/activity_edit_repeated_trip.xml
@@ -92,10 +92,11 @@
                     android:layout_height="55dp"
                     android:layout_weight="1"
                     android:layout_marginEnd="3dp"
+                    android:autoSizeTextType="uniform"
                     android:text="@string/button_repeated_trips_make_trip"
                     style="@style/selectDate"
                     android:letterSpacing="0"
-                    android:textSize="14sp" />
+                    android:autoSizeMaxTextSize="20sp" />
 
                 <!-- BUTTON PICK DATE -->
                 <Button
@@ -105,10 +106,11 @@
                     android:layout_height="55dp"
                     android:layout_weight="1"
                     android:layout_marginStart="3dp"
+                    android:autoSizeTextType="uniform"
                     android:text="@string/button_remove_trip"
                     style="@style/deleteButton"
                     android:letterSpacing="0"
-                    android:textSize="20sp" />
+                    android:autoSizeMaxTextSize="20sp" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a51aa39a..4c384a94 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/nav_view"
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index 9e4db594..e54d1d8f 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -1,79 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".fragments.history.HistoryFragment">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/button_add"
+    <!-- FUEL FILLS COUNT TEXT VIEW -->
+    <TextView
+        android:id="@+id/text_view_history_total_fuel_fill_records"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:clickable="true"
-        android:src="@android:drawable/ic_input_add"
-        style="@style/buttonMainBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.954"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.88" />
-
-    <ScrollView
-        android:id="@+id/scrollView2"
+        android:text="x Total Fuel Fill Records"
+        android:visibility="invisible"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="10dp" />
+
+    <!-- MAIN LAYOUT -->
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="538dp"
-        android:layout_marginBottom="142dp"
-        android:layout_marginEnd="5dp"
-        android:layout_marginStart="5dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.5">
+        android:layout_height="match_parent"
+        android:layout_marginBottom="65dp"
+        android:orientation="vertical">
+
+        <!-- MAIN SCROLL VIEW WITH RECORDS -->
+        <ScrollView
+            android:id="@+id/scrollView2"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginHorizontal="10dp">
+
+            <LinearLayout
+                android:id="@+id/historyFragment_linearLayoutScrollView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            </LinearLayout>
+        </ScrollView>
+
+        <!-- SCROLL VIEW FOR NO RECORDS -->
+        <ScrollView
+            android:id="@+id/scroll_view_no_records"
+            android:layout_width="match_parent"
+            android:visibility="gone"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginBottom="65dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center">
+
+                <ImageView
+                    android:id="@+id/image_view_records_nothing"
+                    android:contentDescription="@string/text_view_no_data"
+                    android:layout_gravity="center"
+                    android:layout_width="250dp"
+                    android:layout_height="250dp"
+                    android:src="@drawable/no_petrol_icon" />
+
+                <TextView
+                    android:id="@+id/text_view_no_data"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="32sp"
+                    android:text="@string/text_view_no_records"
+                    android:textAlignment="center" />
 
+            </LinearLayout>
+        </ScrollView>
+
+        <!-- LAYOUT WITH TEXT AND BUTTON -->
         <LinearLayout
-            android:id="@+id/historyFragment_linearLayoutScrollView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-        </LinearLayout>
+            android:layout_marginHorizontal="10dp"
+            android:orientation="horizontal" >
 
-    </ScrollView>
+            <TextView
+                android:id="@+id/textViewClickCardsMsg"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:visibility="invisible"
+                android:layout_gravity="center"
+                android:text="@string/text_view_click_cards_message" />
 
-    <TextView
-        android:id="@+id/textViewClickCardsMsg"
-        android:layout_width="208dp"
-        android:layout_height="44dp"
-        android:text="@string/text_view_click_cards_message"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/button_add"
-        app:layout_constraintHorizontal_bias="0.122"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.882" />
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/button_add"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:outlineSpotShadowColor="@android:color/transparent"
+                android:layout_weight="0"
+                android:src="@android:drawable/ic_input_add"
+                style="@style/buttonMainBackground" />
 
-    <TextView
-        android:id="@+id/text_view_history_total_fuel_fill_records"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="x Total Fuel Fill Records"
-        app:layout_constraintBottom_toTopOf="@+id/scrollView2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.045"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/image_view_records_nothing"
-        android:layout_width="wrap_content"
-        android:visibility="gone"
-        android:layout_height="wrap_content"
-        android:src="@android:drawable/btn_dialog"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 0ea3b87d..db8213e5 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginBottom="60dp">
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:id="@+id/main_linear_layout"
         tools:context=".fragments.home.HomeFragment"
         android:orientation="vertical">
 
@@ -54,6 +55,62 @@
 
         </androidx.cardview.widget.CardView>
 
+        <!-- CONDITIONAL NO DATA CARD -->
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="10dp"
+            android:tag="no_data"
+            android:visibility="gone"
+            android:layout_marginTop="20dp"
+            style="@style/cardMainBackground"
+            android:layout_marginBottom="10dp"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="5dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/text_view_no_data"
+                    style="@style/textColor"
+                    android:textSize="28sp"
+                    android:textStyle="bold"
+                    android:textAlignment="center" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="10dp"
+                    android:layout_marginVertical="10dp"
+                    android:justificationMode="inter_word"
+                    style="@style/textColorSpecial"
+                    android:text="@string/text_view_no_data_long"
+                    />
+
+                <Button
+                    android:id="@+id/start_exploring"
+                    android:layout_width="match_parent"
+                    android:layout_height="57dp"
+                    android:layout_marginHorizontal="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="START ADDING DATA"
+                    app:cornerRadius="65dp"
+                    android:letterSpacing="0.03"
+                    app:icon="@drawable/ic_dashboard_black_24dp" />
+
+
+
+            </LinearLayout>
+
+        </androidx.cardview.widget.CardView>
+
+        <!-- LINE GRAPH -->
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -61,6 +118,7 @@
             android:layout_marginRight="10dp"
             android:layout_marginTop="20dp"
             app:cardCornerRadius="10dp"
+            android:tag="yes_data"
             style="@style/cardMainBackground"
             app:cardElevation="5dp">
 
@@ -89,7 +147,9 @@
 
         </androidx.cardview.widget.CardView>
 
+        <!-- PIE CHART -->
         <androidx.cardview.widget.CardView
+            android:id="@+id/pie_chart_costs_card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
@@ -98,11 +158,7 @@
             style="@style/cardMainBackground"
             android:layout_marginBottom="10dp"
             app:cardCornerRadius="10dp"
-            app:cardElevation="5dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:cardElevation="5dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -136,20 +192,17 @@
 
         </androidx.cardview.widget.CardView>
 
+        <!-- AVERAGE CONSUMPTION -->
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginHorizontal="10dp"
             android:layout_marginTop="20dp"
-            style="@style/cardMainBackground"
             android:layout_marginBottom="10dp"
+            style="@style/cardMainBackground"
+            android:tag="yes_data"
             app:cardCornerRadius="10dp"
-            app:cardElevation="5dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:cardElevation="5dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_repeated_trips.xml b/app/src/main/res/layout/fragment_repeated_trips.xml
index 5975cf38..e0a2d0cb 100644
--- a/app/src/main/res/layout/fragment_repeated_trips.xml
+++ b/app/src/main/res/layout/fragment_repeated_trips.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,51 +7,79 @@
     android:orientation="vertical"
     tools:context=".fragments.repeated_trips.RepeatedTripsFragment">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/button_add"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:src="@android:drawable/ic_input_add"
-        style="@style/buttonMainBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.954"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.888" />
-
-    <ScrollView
-        android:id="@+id/scrollView2"
+    <!-- MAIN LAYOUT -->
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginEnd="5dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="140dp"
-        android:layout_marginStart="5dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.5">
-
-        <LinearLayout
-            android:id="@+id/repeated_trips_fragment_linearLayoutScrollView"
+        android:layout_marginHorizontal="10dp"
+        android:orientation="vertical"
+        android:layout_marginBottom="65dp">
+
+        <!-- SCROLL VIEW WITH DATA -->
+        <ScrollView
+            android:id="@+id/scrollView2"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:id="@+id/repeated_trips_fragment_linearLayoutScrollView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+
+        </ScrollView>
+
+        <!-- SCROLL VIEW WITHOUT DATA -->
+        <ScrollView
+            android:id="@+id/scrollViewNoData"
             android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:id="@+id/layout_with_no_data"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/image_view_records_nothing"
+                    android:contentDescription="@string/text_view_no_data"
+                    android:layout_gravity="center"
+                    android:layout_width="250dp"
+                    android:layout_height="250dp"
+                    android:src="@drawable/repeated_trips_icon" />
+
+                <TextView
+                    android:id="@+id/text_view_no_data"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="32sp"
+                    android:text="@string/text_view_no_trips"
+                    android:textAlignment="center" />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/button_add"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical" />
-    </ScrollView>
-
-    <ImageView
-        android:id="@+id/image_view_records_nothing"
-        android:layout_width="wrap_content"
-        android:visibility="gone"
-        android:layout_height="wrap_content"
-        android:src="@android:drawable/btn_dialog"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            android:clickable="true"
+            android:layout_gravity="end"
+            android:outlineSpotShadowColor="@android:color/transparent"
+            android:src="@android:drawable/ic_input_add"
+            style="@style/buttonMainBackground" />
+
+    </LinearLayout>
+
+
+
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_services.xml b/app/src/main/res/layout/fragment_services.xml
index f2bbb6a9..d104b039 100644
--- a/app/src/main/res/layout/fragment_services.xml
+++ b/app/src/main/res/layout/fragment_services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/LinearLayoutServices"
@@ -8,19 +8,11 @@
     android:orientation="vertical"
     tools:context=".fragments.services.ServicesFragment">
 
-
-    <!-- SERVICES -->
+    <!-- TAB LAYOUT -->
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0">
-
+        android:layout_height="wrap_content">
 
         <com.google.android.material.tabs.TabItem
             android:layout_width="match_parent"
@@ -31,67 +23,127 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:text="@string/tab_services"/>
+    </com.google.android.material.tabs.TabLayout>
 
+    <!-- MAIN LAYOUT -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="65dp"
+        android:orientation="vertical">
 
+        <!-- MALFUNCTIONS -->
+        <ScrollView
+            android:id="@+id/scroll_view_malfunctions"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:visibility="visible">
 
-    </com.google.android.material.tabs.TabLayout>
+            <LinearLayout
+                android:id="@+id/linear_layout_malfunctions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-    <!-- SERVICES -->
-    <ScrollView
-        android:id="@+id/scroll_view_services"
-        android:layout_width="match_parent"
-        android:layout_height="540dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.251">
-
-        <LinearLayout
-            android:id="@+id/linear_layout_services"
+            </LinearLayout>
+        </ScrollView>
+
+        <!-- MALFUNCTIONS NO DATA -->
+        <ScrollView
+            android:id="@+id/scroll_view_malfunctions_no_data"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/image_view_records_nothing"
+                    android:contentDescription="@string/text_view_no_data"
+                    android:layout_gravity="center"
+                    android:layout_width="250dp"
+                    android:layout_height="250dp"
+                    android:src="@drawable/check_engine_icon" />
+
+                <TextView
+                    android:id="@+id/text_view_no_data"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="32sp"
+                    android:text="@string/text_view_no_malfunctions"
+                    android:textAlignment="center" />
+
+            </LinearLayout>
+        </ScrollView>
+
+        <!-- SERVICES -->
+        <ScrollView
+            android:id="@+id/scroll_view_services"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:visibility="gone">
 
-        </LinearLayout>
-    </ScrollView>
+            <LinearLayout
+                android:id="@+id/linear_layout_services"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
+            </LinearLayout>
+        </ScrollView>
 
-    <!-- MALFUNCTIONS -->
-    <ScrollView
-        android:id="@+id/scroll_view_malfunctions"
-        android:layout_width="match_parent"
-        android:layout_height="540dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.251"
-        android:visibility="visible">
-
-        <LinearLayout
-            android:id="@+id/linear_layout_malfunctions"
+        <!-- SERVICES NO DATA -->
+        <ScrollView
+            android:id="@+id/scroll_view_services_no_data"
             android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/image_view_records_nothing_service"
+                    android:contentDescription="@string/text_view_no_data"
+                    android:layout_gravity="center"
+                    android:layout_width="250dp"
+                    android:layout_height="250dp"
+                    android:src="@drawable/car_service_icon" />
+
+                <TextView
+                    android:id="@+id/text_view_no_data_service"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="32sp"
+                    android:text="@string/text_view_no_services"
+                    android:textAlignment="center" />
+
+            </LinearLayout>
+        </ScrollView>
+
+
+        <!-- ADD BUTTON -->
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/button_add_service"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-        </LinearLayout>
-    </ScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/button_add_service"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        style="@style/buttonMainBackground"
-        android:src="@android:drawable/ic_input_add"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.954"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.871" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            android:layout_marginHorizontal="10dp"
+            android:outlineSpotShadowColor="@android:color/transparent"
+            android:layout_weight="0"
+            android:layout_gravity="end"
+            style="@style/buttonMainBackground"
+            android:src="@android:drawable/ic_input_add" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/shared/layout/bottom_delete_edit_buttons.xml b/app/src/main/res/shared/layout/bottom_delete_edit_buttons.xml
index fab1f4c9..8f516d59 100644
--- a/app/src/main/res/shared/layout/bottom_delete_edit_buttons.xml
+++ b/app/src/main/res/shared/layout/bottom_delete_edit_buttons.xml
@@ -14,12 +14,13 @@
         android:layout_width="match_parent"
         android:layout_height="65dp"
         android:layout_marginTop="10dp"
-        android:layout_marginEnd="2dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginBottom="10dp"
         android:layout_weight="1"
         android:gravity="center"
         android:isScrollContainer="false"
         android:text="@string/button_delete"
+
         android:textSize="18sp"
         android:letterSpacing="0.04"
         style="@style/deleteButton"
@@ -34,7 +35,7 @@
         android:layout_width="match_parent"
         android:layout_height="65dp"
         android:layout_marginTop="10dp"
-        android:layout_marginEnd="2dp"
+        android:layout_marginStart="5dp"
         android:layout_marginBottom="10dp"
         android:layout_weight="1"
         android:gravity="center"
diff --git a/app/src/main/res/shared/layout/date_picker.xml b/app/src/main/res/shared/layout/date_picker.xml
index 3f2a1394..d87962a4 100644
--- a/app/src/main/res/shared/layout/date_picker.xml
+++ b/app/src/main/res/shared/layout/date_picker.xml
@@ -33,9 +33,10 @@
             android:layout_weight="1"
             android:layout_marginEnd="3dp"
             android:text="@string/button_select_date"
+            android:autoSizeTextType="uniform"
             style="@style/selectDate"
-            android:letterSpacing="0"
-            android:textSize="18sp" />
+            android:autoSizeMaxTextSize="20sp"
+            android:letterSpacing="0" />
 
         <Button
             android:id="@+id/todayButton"
@@ -46,8 +47,9 @@
             android:layout_marginStart="3dp"
             android:theme="@style/selectToday"
             android:text="@string/button_select_todays_date"
-            android:letterSpacing="0"
-            android:textSize="18sp" />
+            android:autoSizeTextType="uniform"
+            android:autoSizeMaxTextSize="20sp"
+            android:letterSpacing="0" />
 
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/shared/layout/location_picker.xml b/app/src/main/res/shared/layout/location_picker.xml
index 63ee9940..309cfcc3 100644
--- a/app/src/main/res/shared/layout/location_picker.xml
+++ b/app/src/main/res/shared/layout/location_picker.xml
@@ -33,9 +33,10 @@
             android:layout_marginEnd="3dp"
             android:text="@string/button_select_location"
             android:letterSpacing="0"
+            android:autoSizeTextType="uniform"
             style="@style/selectToday"
             app:cornerRadius="55dp"
-            android:textSize="18sp" />
+            android:autoSizeMaxTextSize="20sp" />
 
         <Button
             android:id="@+id/deleteLocationButton"
@@ -43,11 +44,12 @@
             android:layout_height="55dp"
             android:layout_weight="1"
             android:layout_marginStart="3dp"
+            android:autoSizeTextType="uniform"
             style="@style/deleteButton"
             android:text="@string/button_delete_location"
             app:cornerRadius="55dp"
             android:letterSpacing="0"
-            android:textSize="16sp" />
+            android:autoSizeMaxTextSize="20sp" />
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 92340c02..a2065463 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -61,9 +61,9 @@
     <string name="graph_view_liters_per_100_km">Λίτρα/100 χλμ. συναρτήσει με τον χρόνο</string>
     <string name="graph_view_km_per_lt">χλμ/λίτρο συναρτήσει με τον χρόνο</string>
     <string name="graph_view_cost_per_km">κόστος/χλμ. συναρτήσει με τον χρόνο</string>
-    <string name="text_view_no_data">Ανεπαρκή δεδομένα.</string>
+    <string name="text_view_no_data">Ανεπαρκή Δεδομένα!</string>
     <string name="title_repeated_trips">Διαδρομές</string>
-    <string name="title_services">Βλάβες/Σέρβις</string>
+    <string name="title_services">Συντήρηση</string>
     <string name="toast_invalid_credentials">Λάθος username/κωδικός.</string>
     <string name="toast_username_already_taken">Αυτό το username χρησιμοποιείται ήδη.</string>
     <string name="toast_session_ended">Η σύνοδός σας έληξε. Παρακαλώ, συνδεθείτε ξανά.</string>
@@ -186,7 +186,7 @@
     <string name="service_description_hint">Περιγράψτε τι έγινε σε αυτό το σέρβις...</string>
     <string name="service_info_label">Στοιχεία Σέρβις:</string>
     <string name="text_view_malfunction_info">Στοιχεία Βλάβης:</string>
-    <string name="button_remove_trip">ΔΙΑΓΡΑΦΗ</string>
+    <string name="button_remove_trip">ΔΙΑΓΡΑΦΗ ΔΙΑΔΡΟΜΗΣ</string>
     <string name="trip_info">Στοιχεία Διαδρομής:</string>
     <string name="analytics_per_one_time">ΣΤΑΤΙΣΤΙΚΑ ΑΝΑ ΦΟΡΑ:</string>
     <string name="analytics_weekly">ΕΒΔΟΜΑΔΙΑΙΑ ΣΤΑΤΙΣΤΙΚΑ:</string>
@@ -194,4 +194,11 @@
     <string name="button_edit">ΑΛΛΑΓΗ</string>
     <string name="account_info">Στοιχεία Λογαριασμού:</string>
     <string name="car_info">Στοιχεία Αυτοκινήτου:</string>
+    <string name="text_view_no_data_long">Αυτήν τη στιγμή δεν υπάρχουν Γεμίσματα που μπορούν να προβληθούν εδώ. Ξεκινήστε να βάζετε δεδομένα πατώντας το εικονίδιο του ιστορικού και μετά της προσθήκης, ή απλά πατώντας το κουμπί παρακάτω. Όταν βάλετε δεδομένα, θα σας προβάλλονται σε αυτή τη σελίδα κάποια γραφήματα, μαζί με δεδομένα μέσης κατανάλωσης του αυτοκινήτου σας.</string>
+    <string name="text_view_no_records">Δεν Υπάρχουν Γεμίσματα</string>
+    <string name="text_view_no_malfunctions">Δεν Υπάρχουν Βλάβες</string>
+    <string name="text_view_no_services">Δεν Υπάρχουν Σέρβις</string>
+    <string name="text_view_no_trips">Δεν Υπάρχουν Διαδρομές</string>
+    <string name="malfunction_edit_warning">ΠΡΟΣΟΧΗ: Ξετικάροντας, θα μαρκάρετε την βλάβη ως μη φτιαγμένη πάλι.</string>
+    <string name="malfunction_select_date_fixed">Επιλέξτε ημερομηνία επισκευής...</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c45e0fe0..04cb28ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,9 +61,9 @@
     <string name="graph_view_liters_per_100_km">lt./100km depend on time</string>
     <string name="graph_view_km_per_lt">km/lt depend on time</string>
     <string name="graph_view_cost_per_km">cost/km depend on time</string>
-    <string name="text_view_no_data">No data.</string>
+    <string name="text_view_no_data">Insufficient Data!</string>
     <string name="title_repeated_trips">Trips</string>
-    <string name="title_services">Services</string>
+    <string name="title_services">Maintenance</string>
     <string name="toast_invalid_credentials">Invalid username/password.</string>
     <string name="toast_username_already_taken">This username is already in use.</string>
     <string name="toast_session_ended">The session has ended. Please log in again.</string>
@@ -195,4 +195,11 @@
     <string name="button_edit">EDIT</string>
     <string name="account_info">Account Info:</string>
     <string name="car_info">Car Info:</string>
+    <string name="text_view_no_data_long">At the moment, there are no Fuel Fill Records available to show. You can start inputting data by clicking the history icon below, then the add icon, or just by clicking the button below. Once you input data, you\'ll see here Graphs and Average consumption/costs.</string>
+    <string name="text_view_no_records">No Fuel Fill Records</string>
+    <string name="text_view_no_malfunctions">No Malfunctions</string>
+    <string name="text_view_no_services">No Services</string>
+    <string name="text_view_no_trips">No Trips</string>
+    <string name="malfunction_edit_warning">WARNING: By unchecking, you will mark this Malfunction as ongoing again.</string>
+    <string name="malfunction_select_date_fixed">Selected date fixed...</string>
 </resources>
\ No newline at end of file