diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b89614a..f3fc354 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.INTERNET" android:required="true"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" android:required="true"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" android:required="true"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="25"/>
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/denizd/substitutionplan/FBNotificationService.kt b/app/src/main/java/com/denizd/substitutionplan/FBNotificationService.kt
index 1d9ed7e..b50f99c 100644
--- a/app/src/main/java/com/denizd/substitutionplan/FBNotificationService.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/FBNotificationService.kt
@@ -6,7 +6,13 @@ import com.google.firebase.messaging.RemoteMessage
 class FBNotificationService : FirebaseMessagingService() {
 
     override fun onMessageReceived(p0: RemoteMessage) {
-        DataFetcher(isPlan = true, isMenu = true, isJobService = true, context = applicationContext,
-                application = application, parentView = null).execute()
+        DataFetcher(
+            isPlan = true,
+            isMenu = true,
+            isJobService = true,
+            context = applicationContext,
+            application = application,
+            parentView = null
+        ).execute()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/denizd/substitutionplan/PlanFragment.kt b/app/src/main/java/com/denizd/substitutionplan/PlanFragment.kt
index 5f54a3e..2efc6e0 100644
--- a/app/src/main/java/com/denizd/substitutionplan/PlanFragment.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/PlanFragment.kt
@@ -22,9 +22,8 @@ open class PlanFragment : Fragment(R.layout.plan) {
     private lateinit var layoutManager: GridLayoutManager
     var planCardList = ArrayList<Subst>()
     lateinit var substViewModel: SubstViewModel
-    lateinit var mContext: Context
+    private lateinit var mContext: Context
     lateinit var prefs: SharedPreferences
-    lateinit var edit: SharedPreferences.Editor
 
     lateinit var smileydown: TextView
     lateinit var smileydowntext: TextView
@@ -40,19 +39,7 @@ open class PlanFragment : Fragment(R.layout.plan) {
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        val tabletSize = resources.getBoolean(R.bool.isTablet)
-        val grid = if (tabletSize) {
-            when (newConfig.orientation) {
-                Configuration.ORIENTATION_PORTRAIT -> 2
-                else -> 3
-            }
-        } else {
-            when (newConfig.orientation) {
-                Configuration.ORIENTATION_PORTRAIT -> 1
-                else -> 2
-            }
-        }
-        layoutManager = GridLayoutManager(mContext, grid)
+        layoutManager = GridLayoutManager(mContext, getGridColumnCount(newConfig))
         recyclerView.layoutManager = layoutManager
     }
 
@@ -62,21 +49,7 @@ open class PlanFragment : Fragment(R.layout.plan) {
 
         recyclerView = view.findViewById(R.id.linearRecycler)
         recyclerView.hasFixedSize()
-
-        val tabletSize = resources.getBoolean(R.bool.isTablet)
-        val grid = if (tabletSize) {
-            when (resources.configuration.orientation) {
-                Configuration.ORIENTATION_PORTRAIT -> 2
-                else -> 3
-            }
-        } else {
-            when (resources.configuration.orientation) {
-                Configuration.ORIENTATION_PORTRAIT -> 1
-                else -> 2
-            }
-        }
-
-        layoutManager = GridLayoutManager(mContext, grid)
+        layoutManager = GridLayoutManager(mContext, getGridColumnCount(resources.configuration))
         recyclerView.layoutManager = layoutManager
 
         mAdapter = CardAdapter(planCardList)
@@ -92,13 +65,42 @@ open class PlanFragment : Fragment(R.layout.plan) {
 
         if (prefs.getBoolean("autoRefresh", false)) {
             pullToRefresh.isRefreshing = true
-            DataFetcher(true, false, false, mContext, activity!!.application, view.rootView).execute()
+            DataFetcher(
+                isPlan = true,
+                isMenu = false,
+                isJobService = false,
+                context = mContext,
+                application = activity!!.application,
+                parentView = view.rootView
+            ).execute()
         }
         substViewModel = ViewModelProviders.of(this).get(SubstViewModel::class.java)
 
         pullToRefresh.setOnRefreshListener {
             pullToRefresh.isRefreshing = true
-            DataFetcher(true, false, false, mContext, activity!!.application, view.rootView).execute()
+            DataFetcher(
+                isPlan = true,
+                isMenu = false,
+                isJobService = false,
+                context = mContext,
+                application = activity!!.application,
+                parentView = view.rootView
+            ).execute()
+        }
+    }
+
+    private fun getGridColumnCount(config: Configuration): Int {
+        val tabletSize = resources.getBoolean(R.bool.isTablet)
+        return if (tabletSize) {
+            when (config.orientation) {
+                Configuration.ORIENTATION_PORTRAIT -> 2
+                else -> 3
+            }
+        } else {
+            when (config.orientation) {
+                Configuration.ORIENTATION_PORTRAIT -> 1
+                else -> 2
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
index 8594b7e..7c8af4f 100644
--- a/app/src/main/res/layout/list_item.xml
+++ b/app/src/main/res/layout/list_item.xml
@@ -13,7 +13,7 @@
     android:layout_marginEnd="8dp"
     android:layout_marginTop="3dp"
     android:layout_marginBottom="3dp"
-    app:cardElevation="0dp">
+    app:cardElevation="2dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"