diff --git a/app/build.gradle b/app/build.gradle
index 68d22f95..cd4ef25a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "cz.martykan.forecastie"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 68
-        versionName "1.18.2"
+        versionCode 70
+        versionName "1.19.1"
     }
 
     lintOptions {
@@ -35,8 +35,6 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "com.google.android.material:material:1.2.1"
-    implementation "com.google.android.flexbox:flexbox:3.0.0"
-    implementation "androidx.core:core:1.5.0"
 
     /** Lifecycle */
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
diff --git a/app/src/main/java/cz/martykan/forecastie/activities/MainActivity.java b/app/src/main/java/cz/martykan/forecastie/activities/MainActivity.java
index e5048a31..d01b7333 100644
--- a/app/src/main/java/cz/martykan/forecastie/activities/MainActivity.java
+++ b/app/src/main/java/cz/martykan/forecastie/activities/MainActivity.java
@@ -100,7 +100,6 @@ public class MainActivity extends BaseActivity implements LocationListener {
     private ViewPager viewPager;
     private TabLayout tabLayout;
     private SwipeRefreshLayout swipeRefreshLayout;
-    private ViewPagerAdapter pagerAdapter;
 
     private View appView;
 
@@ -666,15 +665,12 @@ private void updateLongTermWeatherUI() {
         recyclerViewFragment.setArguments(bundle);
         viewPagerAdapter.addFragment(recyclerViewFragment, getString(R.string.later));
 
-        if(this.pagerAdapter == null) {
-            pagerAdapter = viewPagerAdapter;
-            viewPager.setAdapter(pagerAdapter);
-            tabLayout.setupWithViewPager(viewPager);
-        }
-        pagerAdapter.notifyDataSetChanged();
-
         int currentPage = viewPager.getCurrentItem();
 
+        viewPagerAdapter.notifyDataSetChanged();
+        viewPager.setAdapter(viewPagerAdapter);
+        tabLayout.setupWithViewPager(viewPager);
+
         if (currentPage == 0 && longTermTodayWeather.isEmpty()) {
             currentPage = 1;
         }
diff --git a/app/src/main/res/layout/activity_scrolling.xml b/app/src/main/res/layout/activity_scrolling.xml
index 0fc5a2e0..f6cb0987 100644
--- a/app/src/main/res/layout/activity_scrolling.xml
+++ b/app/src/main/res/layout/activity_scrolling.xml
@@ -32,16 +32,12 @@
                     android:background="?attr/colorPrimary"
                     app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-                <com.google.android.flexbox.FlexboxLayout
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="16dp"
                     android:layout_marginTop="6dp"
                     android:layout_marginBottom="22dp"
-                    app:flexWrap="wrap"
-                    app:flexDirection="row"
-                    app:justifyContent="space_between"
-                    app:alignItems="flex_start"
                     android:baselineAligned="false"
                     android:paddingTop="?attr/actionBarSize">
 
@@ -56,7 +52,7 @@
                             android:layout_height="wrap_content"
                             tools:text="0 °C"
                             android:textColor="@color/text_light"
-                            android:textSize="36sp"/>
+                            android:textSize="36dp"/>
 
                         <TextView
                             android:id="@+id/todayDescription"
@@ -64,7 +60,7 @@
                             android:layout_height="wrap_content"
                             tools:text="No data"
                             android:textColor="@color/text_light"
-                            android:textSize="16sp"/>
+                            android:textSize="16dp"/>
 
                         <TextView
                             android:id="@+id/todayWind"
@@ -73,7 +69,7 @@
                             android:layout_marginTop="8dp"
                             tools:text="Wind: 0 m/s"
                             android:textColor="@color/text_light"
-                            android:textSize="16sp"/>
+                            android:textSize="16dp"/>
 
                         <TextView
                             android:id="@+id/todayPressure"
@@ -81,7 +77,7 @@
                             android:layout_height="wrap_content"
                             tools:text="Pressure: 0 hpa"
                             android:textColor="@color/text_light"
-                            android:textSize="16sp"/>
+                            android:textSize="16dp"/>
 
                         <TextView
                             android:id="@+id/todayHumidity"
@@ -89,7 +85,7 @@
                             android:layout_height="wrap_content"
                             tools:text="Humidity: 0 %"
                             android:textColor="@color/text_light"
-                            android:textSize="16sp"/>
+                            android:textSize="16dp"/>
 
                         <TextView
                             android:id="@+id/todaySunrise"
@@ -97,7 +93,7 @@
                             android:layout_height="wrap_content"
                             tools:text="Sunrise: 00:00"
                             android:textColor="@color/text_light"
-                            android:textSize="16sp"/>
+                            android:textSize="16dp"/>
 
                         <TextView
                             android:id="@+id/todaySunset"
@@ -105,7 +101,7 @@
                             android:layout_height="wrap_content"
                             tools:text="Sunset: 00:00"
                             android:textColor="@color/text_light"
-                            android:textSize="16sp"/>
+                            android:textSize="16dp"/>
 
                         <TextView
                             android:id="@+id/todayUvIndex"
@@ -113,7 +109,7 @@
                             android:layout_height="wrap_content"
                             tools:text="Uv Index: Loading..."
                             android:textColor="@color/text_light"
-                            android:textSize="16sp"/>
+                            android:textSize="16dp"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -135,10 +131,11 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
                                 android:gravity="center"
-                                android:paddingRight="42dp"
+                                android:paddingRight="16dp"
                                 android:textColor="@color/text_light"
                                 android:text=""
-                                android:textSize="72sp"/>
+                                android:textSize="72dp"
+                                android:paddingEnd="16dp" />
 
                             <TextView
                                 android:id="@+id/tapGraph"
@@ -150,7 +147,7 @@
                                 android:layout_marginTop="-20dp"
                                 android:textColor="@color/text_light"
                                 android:text=""
-                                android:textSize="14sp" />
+                                android:textSize="14dp" />
 
 
                         </LinearLayout>
@@ -168,12 +165,11 @@
                             android:gravity="bottom|end"
                             android:paddingRight="16dp"
                             android:textAlignment="viewEnd"
-                            android:textSize="14sp"/>
+                            android:textSize="14dp"/>
                     </LinearLayout>
 
 
-
-                </com.google.android.flexbox.FlexboxLayout>
+                </LinearLayout>
 
             </com.google.android.material.appbar.CollapsingToolbarLayout>
 
diff --git a/app/src/main/res/layout/list_row.xml b/app/src/main/res/layout/list_row.xml
index 109533fa..6839bdbe 100644
--- a/app/src/main/res/layout/list_row.xml
+++ b/app/src/main/res/layout/list_row.xml
@@ -13,13 +13,9 @@
         android:layout_height="1dp"
         android:background="?android:attr/listDivider" />
 
-    <com.google.android.flexbox.FlexboxLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:alignItems="flex_start"
-        app:flexDirection="row"
-        app:flexWrap="wrap"
-        app:justifyContent="space_between">
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -34,7 +30,7 @@
                 android:layout_height="wrap_content"
                 tools:text="16:00"
                 android:textColor="?android:textColorPrimary"
-                android:textSize="16sp"
+                android:textSize="16dp"
                 android:textStyle="bold" />
 
             <TextView
@@ -42,7 +38,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="No data"
-                android:textSize="16sp" />
+                android:textSize="16dp" />
 
             <TextView
                 android:id="@+id/itemWind"
@@ -50,55 +46,45 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 tools:text="Wind: 0 m/s"
-                android:textSize="16sp" />
+                android:textSize="16dp" />
 
             <TextView
                 android:id="@+id/itemPressure"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="Pressure: 0 hpa"
-                android:textSize="16sp" />
+                android:textSize="16dp" />
 
             <TextView
                 android:id="@+id/itemHumidity"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="Humidity: 0 %"
-                android:textSize="16sp" />
+                android:textSize="16dp" />
         </LinearLayout>
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/itemIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="16dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
             android:layout_marginRight="16dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/itemIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="16dp"
-                android:layout_weight="1"
-                tools:text="o"
-                android:textSize="48sp" />
-
-            <TextView
-                android:id="@+id/itemTemperature"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="0 °C"
-                android:textSize="22sp"
-                android:layout_marginTop="8dp"
-                android:layout_below="@+id/itemIcon"
-                android:layout_alignRight="@+id/itemIcon"
-                android:layout_alignEnd="@+id/itemIcon" />
+            android:layout_marginTop="16dp"
+            android:layout_weight="1"
+            tools:text="o"
+            android:textSize="48sp" />
 
-        </LinearLayout>
-    </com.google.android.flexbox.FlexboxLayout>
-</LinearLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/itemTemperature"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="0 °C"
+            android:textSize="22dp"
+            android:layout_marginTop="8dp"
+            android:layout_below="@+id/itemIcon"
+            android:layout_alignRight="@+id/itemIcon"
+            android:layout_alignEnd="@+id/itemIcon" />
+    </RelativeLayout>
+</LinearLayout>