diff --git a/src/redux/updates/updates.actions.js b/src/redux/updates/updates.actions.js
index f17b995f..56a9ad65 100644
--- a/src/redux/updates/updates.actions.js
+++ b/src/redux/updates/updates.actions.js
@@ -26,7 +26,7 @@ export const getUpdatesAction = () => async dispatch => {
   const groupedUpdates = Object.keys(groups).map(date => {
     return {
       date,
-      chapters: groups[date],
+      data: groups[date],
     };
   });
 
diff --git a/src/screens/history/History.js b/src/screens/history/History.js
index c4bcad76..6f483a73 100644
--- a/src/screens/history/History.js
+++ b/src/screens/history/History.js
@@ -5,6 +5,7 @@ import {
   ActivityIndicator,
   Text,
   View,
+  SectionList,
 } from 'react-native';
 
 import moment from 'moment';
@@ -106,7 +107,7 @@ const History = ({navigation}) => {
     const groupedHistory = Object.keys(groups).map(date => {
       return {
         date,
-        novels: groups[date],
+        data: groups[date],
       };
     });
 
@@ -129,23 +130,15 @@ const History = ({navigation}) => {
           },
         ]}
       />
-      <FlatList
+      <SectionList
         contentContainerStyle={styles.container}
-        data={searchText ? searchResults : groupByDate(history)}
-        keyExtractor={item => item.date}
-        renderItem={({item}) => (
-          <FlatList
-            keyExtractor={item => item.novelId.toString()}
-            data={item.novels}
-            renderItem={renderHistoryCard}
-            ListHeaderComponent={
-              <Text
-                style={[styles.dateHeader, {color: theme.textColorSecondary}]}
-              >
-                {moment(item.date).calendar(null, dateFormat)}
-              </Text>
-            }
-          />
+        sections={searchText ? searchResults : groupByDate(history)}
+        keyExtractor={(item, index) => index.toString()}
+        renderItem={renderHistoryCard}
+        renderSectionHeader={({section: {date}}) => (
+          <Text style={[styles.dateHeader, {color: theme.textColorSecondary}]}>
+            {moment(date).calendar(null, dateFormat)}
+          </Text>
         )}
         ListFooterComponent={
           loading && (
diff --git a/src/screens/updates/Updates.js b/src/screens/updates/Updates.js
index 3a585a85..7ae42398 100644
--- a/src/screens/updates/Updates.js
+++ b/src/screens/updates/Updates.js
@@ -6,6 +6,7 @@ import {
   ActivityIndicator,
   RefreshControl,
   Text,
+  SectionList,
 } from 'react-native';
 import {useFocusEffect} from '@react-navigation/native';
 import {useDispatch, useSelector} from 'react-redux';
@@ -116,15 +117,6 @@ const Updates = ({navigation}) => {
   const ListEmptyComponent = () =>
     !loading && <EmptyView icon="(˘･_･˘)" description="No recent updates" />;
 
-  const refreshControl = () => (
-    <RefreshControl
-      refreshing={refreshing}
-      onRefresh={onRefresh}
-      colors={['white']}
-      progressBackgroundColor={theme.colorAccent}
-    />
-  );
-
   const clearSearchbar = () => setSearchText('');
 
   const onChangeText = text => {
@@ -149,8 +141,6 @@ const Updates = ({navigation}) => {
     setSearchResults(results);
   };
 
-  const keyExtractor = useCallback(item => item.updateId.toString(), []);
-
   return (
     <View style={[styles.container, {backgroundColor: theme.colorPrimaryDark}]}>
       <Searchbar
@@ -174,32 +164,26 @@ const Updates = ({navigation}) => {
           Library last updated: {moment(lastUpdateTime).fromNow()}
         </Text>
       )}
-      <FlatList
+      <SectionList
         contentContainerStyle={styles.flatList}
-        data={searchText ? searchResults : updates}
+        sections={searchText ? searchResults : updates}
         keyExtractor={(item, index) => index.toString()}
-        renderItem={({item}) => (
-          <FlatList
-            ListHeaderComponent={
-              <Text
-                style={{
-                  paddingHorizontal: 16,
-                  textTransform: 'uppercase',
-                  paddingVertical: 8,
-                  color: theme.textColorSecondary,
-                }}
-              >
-                {moment(item.date).calendar(null, dateFormat)}
-              </Text>
-            }
-            data={item.chapters}
-            keyExtractor={keyExtractor}
-            renderItem={renderItem}
-          />
+        renderItem={renderItem}
+        renderSectionHeader={({section: {date}}) => (
+          <Text style={[styles.header, {color: theme.textColorSecondary}]}>
+            {moment(date).calendar(null, dateFormat)}
+          </Text>
         )}
         ListFooterComponent={<ListFooterComponent />}
         ListEmptyComponent={<ListEmptyComponent />}
-        refreshControl={refreshControl()}
+        refreshControl={
+          <RefreshControl
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+            colors={['white']}
+            progressBackgroundColor={theme.colorAccent}
+          />
+        }
       />
     </View>
   );
@@ -213,7 +197,12 @@ const styles = StyleSheet.create({
   },
   flatList: {
     flexGrow: 1,
-    paddingBottom: 8,
+    paddingBottom: 40,
+  },
+  header: {
+    paddingVertical: 8,
+    paddingHorizontal: 16,
+    textTransform: 'uppercase',
   },
   lastUpdateTime: {
     paddingHorizontal: 16,