diff --git a/lib/Screens/FormulaYou/home.dart b/lib/Screens/FormulaYou/home.dart
index 34177098..9c23fb72 100644
--- a/lib/Screens/FormulaYou/home.dart
+++ b/lib/Screens/FormulaYou/home.dart
@@ -79,7 +79,7 @@ class _PersonalizedHomeScreenState extends State<PersonalizedHomeScreen> {
       backgroundColor: useDarkMode
           ? Theme.of(context).scaffoldBackgroundColor
           : Colors.white,
-      body: NewsFeedWidget(
+      body: NewsFeed(
         tagId: selectedTagsIds.join(','),
       ),
     );
diff --git a/lib/Screens/article.dart b/lib/Screens/article.dart
index 9caee1fc..21759ed0 100644
--- a/lib/Screens/article.dart
+++ b/lib/Screens/article.dart
@@ -18,7 +18,7 @@
  */
 
 import 'package:boxbox/api/article_parts.dart';
-import 'package:boxbox/api/news.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
 import 'package:boxbox/helpers/request_error.dart';
 import 'package:flutter/material.dart';
@@ -117,7 +117,7 @@ class _ArticleScreenState extends State<ArticleScreen> {
 class ArticleProvider extends StatelessWidget {
   Future<Article> getArticleData(
       String articleId, Function updateArticleTitle) async {
-    Article article = await F1NewsFetcher().getArticleData(articleId);
+    Article article = await Formula1().getArticleData(articleId);
     updateArticleTitle(article.articleName);
     return article;
   }
diff --git a/lib/Screens/circuit.dart b/lib/Screens/circuit.dart
index 7e84d6e4..68a0600d 100644
--- a/lib/Screens/circuit.dart
+++ b/lib/Screens/circuit.dart
@@ -23,10 +23,11 @@ import 'package:boxbox/Screens/article.dart';
 import 'package:boxbox/Screens/race_details.dart';
 import 'package:boxbox/api/ergast.dart';
 import 'package:boxbox/api/event_tracker.dart';
-import 'package:boxbox/api/news.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/api/race_components.dart';
 import 'package:boxbox/helpers/convert_ergast_and_formula_one.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:boxbox/helpers/racetracks_url.dart';
 import 'package:boxbox/helpers/request_error.dart';
 import 'package:boxbox/Screens/circuit_map_screen.dart';
@@ -38,7 +39,7 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-class CircuitScreen extends StatefulWidget {
+class CircuitScreen extends StatelessWidget {
   final Race race;
   final bool? isFetched;
 
@@ -48,14 +49,8 @@ class CircuitScreen extends StatefulWidget {
     this.isFetched,
   }) : super(key: key);
 
-  @override
-  State<CircuitScreen> createState() => _CircuitScreenState();
-}
-
-class _CircuitScreenState extends State<CircuitScreen> {
   @override
   Widget build(BuildContext context) {
-    final Race race = widget.race;
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
     bool useDataSaverMode = Hive.box('settings')
@@ -64,7 +59,7 @@ class _CircuitScreenState extends State<CircuitScreen> {
       backgroundColor: useDarkMode
           ? Theme.of(context).scaffoldBackgroundColor
           : Colors.white,
-      body: widget.isFetched ?? true
+      body: isFetched ?? true
           ? NestedScrollView(
               headerSliverBuilder:
                   (BuildContext context, bool innerBoxIsScrolled) {
diff --git a/lib/Screens/driver_details.dart b/lib/Screens/driver_details.dart
index 19d9f337..d04ad7ba 100644
--- a/lib/Screens/driver_details.dart
+++ b/lib/Screens/driver_details.dart
@@ -20,10 +20,11 @@
 import 'package:boxbox/Screens/race_details.dart';
 import 'package:boxbox/api/driver_components.dart';
 import 'package:boxbox/api/ergast.dart';
-import 'package:boxbox/api/news.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/helpers/convert_ergast_and_formula_one.dart';
 import 'package:boxbox/helpers/custom_physics.dart';
 import 'package:boxbox/helpers/driver_result_item.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:boxbox/scraping/formula_one.dart';
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/foundation.dart';
@@ -34,7 +35,7 @@ import 'package:boxbox/helpers/driver_image.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
 import 'package:boxbox/helpers/request_error.dart';
 
-class DriverDetailsScreen extends StatefulWidget {
+class DriverDetailsScreen extends StatelessWidget {
   final String driverId;
   final String givenName;
   final String familyName;
@@ -45,11 +46,6 @@ class DriverDetailsScreen extends StatefulWidget {
     super.key,
   });
 
-  @override
-  State<DriverDetailsScreen> createState() => _DriverDetailsScreenState();
-}
-
-class _DriverDetailsScreenState extends State<DriverDetailsScreen> {
   @override
   Widget build(BuildContext context) {
     bool useDarkMode =
@@ -59,7 +55,7 @@ class _DriverDetailsScreenState extends State<DriverDetailsScreen> {
       child: Scaffold(
         appBar: AppBar(
           title: Text(
-            '${widget.givenName} ${widget.familyName.toUpperCase()}',
+            '${givenName} ${familyName.toUpperCase()}',
             style: const TextStyle(
               fontWeight: FontWeight.w600,
             ),
@@ -91,8 +87,8 @@ class _DriverDetailsScreenState extends State<DriverDetailsScreen> {
             : Colors.white,
         body: TabBarView(
           children: [
-            DriverInfo(widget.driverId),
-            DriverResults(widget.driverId),
+            DriverInfo(driverId),
+            DriverResults(driverId),
           ],
         ),
       ),
@@ -404,7 +400,7 @@ class DriverDetailsFragment extends StatelessWidget {
                 ),
                 itemCount: driverDetails[1].length,
                 itemBuilder: (context, index) => FutureBuilder<Article>(
-                  future: F1NewsFetcher().getArticleData(
+                  future: Formula1().getArticleData(
                     driverDetails[1][index][0],
                   ),
                   builder: (context, snapshot) {
diff --git a/lib/Screens/grand_prix_running_details.dart b/lib/Screens/grand_prix_running_details.dart
index 00b80b78..5df86434 100644
--- a/lib/Screens/grand_prix_running_details.dart
+++ b/lib/Screens/grand_prix_running_details.dart
@@ -38,25 +38,21 @@ import 'package:sliding_up_panel/sliding_up_panel.dart';
 import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-class GrandPrixRunningScreen extends StatefulWidget {
+class GrandPrixRunningScreen extends StatelessWidget {
   final Event event;
   const GrandPrixRunningScreen(
     this.event, {
     Key? key,
   }) : super(key: key);
-  @override
-  State<GrandPrixRunningScreen> createState() => _GrandPrixRunningScreenState();
-}
 
-class _GrandPrixRunningScreenState extends State<GrandPrixRunningScreen> {
   @override
   Widget build(BuildContext context) {
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
     late String meetingName;
-    widget.event.meetingName == 'United States'
+    event.meetingName == 'United States'
         ? meetingName = 'USA'
-        : meetingName = widget.event.meetingName;
+        : meetingName = event.meetingName;
     if (meetingName != 'Great Britain') {
       meetingName = meetingName.replaceAll(' ', '_');
     }
@@ -69,10 +65,10 @@ class _GrandPrixRunningScreenState extends State<GrandPrixRunningScreen> {
           child: MediaQuery.of(context).size.width > 1000
               ? Padding(
                   padding: const EdgeInsets.only(top: 15),
-                  child: Text(widget.event.meetingOfficialName),
+                  child: Text(event.meetingOfficialName),
                 )
               : Marquee(
-                  text: widget.event.meetingOfficialName,
+                  text: event.meetingOfficialName,
                   pauseAfterRound: const Duration(seconds: 1),
                   startAfter: const Duration(seconds: 1),
                   velocity: 85,
@@ -222,7 +218,7 @@ class _GrandPrixRunningScreenState extends State<GrandPrixRunningScreen> {
                             alignment: Alignment.bottomCenter,
                           ),
                           Text(
-                            widget.event.meetingName.toUpperCase(),
+                            event.meetingName.toUpperCase(),
                             style: const TextStyle(
                               color: Colors.white,
                               fontSize: 70,
@@ -249,29 +245,29 @@ class _GrandPrixRunningScreenState extends State<GrandPrixRunningScreen> {
                                 mainAxisSize: MainAxisSize.min,
                                 children: [
                                   SessionItem(
-                                    widget.event.session5,
-                                    widget.event.raceId,
-                                    widget.event.meetingCountryName,
+                                    event.session5,
+                                    event.raceId,
+                                    event.meetingCountryName,
                                   ),
                                   SessionItem(
-                                    widget.event.session4,
-                                    widget.event.raceId,
-                                    widget.event.meetingCountryName,
+                                    event.session4,
+                                    event.raceId,
+                                    event.meetingCountryName,
                                   ),
                                   SessionItem(
-                                    widget.event.session3,
-                                    widget.event.raceId,
-                                    widget.event.meetingCountryName,
+                                    event.session3,
+                                    event.raceId,
+                                    event.meetingCountryName,
                                   ),
                                   SessionItem(
-                                    widget.event.session2,
-                                    widget.event.raceId,
-                                    widget.event.meetingCountryName,
+                                    event.session2,
+                                    event.raceId,
+                                    event.meetingCountryName,
                                   ),
                                   SessionItem(
-                                    widget.event.session1,
-                                    widget.event.raceId,
-                                    widget.event.meetingCountryName,
+                                    event.session1,
+                                    event.raceId,
+                                    event.meetingCountryName,
                                   ),
                                 ],
                               ),
@@ -333,7 +329,7 @@ class _GrandPrixRunningScreenState extends State<GrandPrixRunningScreen> {
                                                 '',
                                                 '',
                                                 '',
-                                                widget.event.circuitImage
+                                                event.circuitImage
                                                     .split('/')
                                                     .last
                                                     .split('.')[0],
@@ -430,29 +426,29 @@ class _GrandPrixRunningScreenState extends State<GrandPrixRunningScreen> {
                         fit: BoxFit.scaleDown,
                       ),
                       SessionItem(
-                        widget.event.session5,
-                        widget.event.raceId,
-                        widget.event.meetingCountryName,
+                        event.session5,
+                        event.raceId,
+                        event.meetingCountryName,
                       ),
                       SessionItem(
-                        widget.event.session4,
-                        widget.event.raceId,
-                        widget.event.meetingCountryName,
+                        event.session4,
+                        event.raceId,
+                        event.meetingCountryName,
                       ),
                       SessionItem(
-                        widget.event.session3,
-                        widget.event.raceId,
-                        widget.event.meetingCountryName,
+                        event.session3,
+                        event.raceId,
+                        event.meetingCountryName,
                       ),
                       SessionItem(
-                        widget.event.session2,
-                        widget.event.raceId,
-                        widget.event.meetingCountryName,
+                        event.session2,
+                        event.raceId,
+                        event.meetingCountryName,
                       ),
                       SessionItem(
-                        widget.event.session1,
-                        widget.event.raceId,
-                        widget.event.meetingCountryName,
+                        event.session1,
+                        event.raceId,
+                        event.meetingCountryName,
                       ),
                       Padding(
                         padding: const EdgeInsets.symmetric(
@@ -510,7 +506,7 @@ class _GrandPrixRunningScreenState extends State<GrandPrixRunningScreen> {
                                   '',
                                   '',
                                   '',
-                                  widget.event.circuitImage
+                                  event.circuitImage
                                       .split('/')
                                       .last
                                       .split('.')[0],
@@ -581,23 +577,13 @@ class _GrandPrixRunningScreenState extends State<GrandPrixRunningScreen> {
   }
 }
 
-class PdfViewer extends StatefulWidget {
+class PdfViewer extends StatelessWidget {
   final String documentTitle;
   final String src;
-  const PdfViewer(this.src, this.documentTitle, {Key? key}) : super(key: key);
-
-  @override
-  State<PdfViewer> createState() => _PdfViewerState();
-}
+  PdfViewer(this.src, this.documentTitle, {Key? key}) : super(key: key);
 
-class _PdfViewerState extends State<PdfViewer> {
   final GlobalKey<SfPdfViewerState> _pdfViewerKey = GlobalKey();
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) {
     const String defaultServer = "https://api.formula1.com";
@@ -606,14 +592,14 @@ class _PdfViewerState extends State<PdfViewer> {
     return Scaffold(
       appBar: AppBar(
         title: Text(
-          widget.documentTitle,
+          documentTitle,
           overflow: TextOverflow.ellipsis,
         ),
       ),
       body: SfPdfViewer.network(
         server != defaultServer
-            ? "$server/documents/${widget.src.split('/').last}"
-            : widget.src,
+            ? "$server/documents/${src.split('/').last}"
+            : src,
         key: _pdfViewerKey,
         enableTextSelection: true,
         onDocumentLoadFailed: (PdfDocumentLoadFailedDetails details) {
@@ -646,7 +632,7 @@ class _PdfViewerState extends State<PdfViewer> {
   }
 }
 
-class SessionItem extends StatefulWidget {
+class SessionItem extends StatelessWidget {
   final Session session;
   final String raceId;
   final String meetingCountryName;
@@ -657,11 +643,7 @@ class SessionItem extends StatefulWidget {
     this.meetingCountryName, {
     Key? key,
   }) : super(key: key);
-  @override
-  State<SessionItem> createState() => _SessionItemState();
-}
 
-class _SessionItemState extends State<SessionItem> {
   @override
   Widget build(BuildContext context) {
     Map sessionsAbbreviations = {
@@ -689,21 +671,21 @@ class _SessionItemState extends State<SessionItem> {
     ];
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
-    String startTimeHour = widget.session.startTime.hour.toString();
-    String startTimeMinute = widget.session.startTime.minute.toString();
-    String endTimeHour = widget.session.endTime.hour.toString();
-    String endTimeMinute = widget.session.endTime.minute.toString();
-    if (widget.session.startTime.hour < 10) {
-      startTimeHour = '0${widget.session.startTime.hour}';
+    String startTimeHour = session.startTime.hour.toString();
+    String startTimeMinute = session.startTime.minute.toString();
+    String endTimeHour = session.endTime.hour.toString();
+    String endTimeMinute = session.endTime.minute.toString();
+    if (session.startTime.hour < 10) {
+      startTimeHour = '0${session.startTime.hour}';
     }
-    if (widget.session.startTime.minute < 10) {
-      startTimeMinute = '0${widget.session.startTime.minute}';
+    if (session.startTime.minute < 10) {
+      startTimeMinute = '0${session.startTime.minute}';
     }
-    if (widget.session.endTime.hour < 10) {
-      endTimeHour = '0${widget.session.endTime.hour}';
+    if (session.endTime.hour < 10) {
+      endTimeHour = '0${session.endTime.hour}';
     }
-    if (widget.session.endTime.minute < 10) {
-      endTimeMinute = '0${widget.session.endTime.minute}';
+    if (session.endTime.minute < 10) {
+      endTimeMinute = '0${session.endTime.minute}';
     }
     String startTime = '$startTimeHour:$startTimeMinute';
     String endTime = '$endTimeHour:$endTimeMinute';
@@ -741,7 +723,7 @@ class _SessionItemState extends State<SessionItem> {
                             mainAxisAlignment: MainAxisAlignment.center,
                             children: [
                               Text(
-                                widget.session.startTime.day.toString(),
+                                session.startTime.day.toString(),
                                 style: TextStyle(
                                   color: useDarkMode
                                       ? Colors.white
@@ -750,7 +732,7 @@ class _SessionItemState extends State<SessionItem> {
                                 ),
                               ),
                               Text(
-                                months[widget.session.startTime.month - 1],
+                                months[session.startTime.month - 1],
                                 style: TextStyle(
                                   color: useDarkMode
                                       ? Colors.white
@@ -782,7 +764,7 @@ class _SessionItemState extends State<SessionItem> {
                             children: [
                               Text(
                                 sessionsAbbreviations[
-                                    widget.session.sessionsAbbreviation],
+                                    session.sessionsAbbreviation],
                                 style: TextStyle(
                                   color: useDarkMode
                                       ? Colors.white
@@ -790,7 +772,7 @@ class _SessionItemState extends State<SessionItem> {
                                   fontSize: 20,
                                 ),
                               ),
-                              widget.session.endTime.isBefore(DateTime.now())
+                              session.endTime.isBefore(DateTime.now())
                                   ? Row(
                                       mainAxisAlignment:
                                           MainAxisAlignment.center,
@@ -822,8 +804,7 @@ class _SessionItemState extends State<SessionItem> {
                                         ),
                                       ],
                                     )
-                                  : widget.session.startTime
-                                          .isBefore(DateTime.now())
+                                  : session.startTime.isBefore(DateTime.now())
                                       ? Row(
                                           mainAxisAlignment:
                                               MainAxisAlignment.center,
@@ -881,8 +862,8 @@ class _SessionItemState extends State<SessionItem> {
                 context,
                 MaterialPageRoute(
                   builder: (context) => SessionScreen(
-                    sessionsAbbreviations[widget.session.sessionsAbbreviation],
-                    widget.session,
+                    sessionsAbbreviations[session.sessionsAbbreviation],
+                    session,
                   ),
                 ),
               ),
@@ -901,7 +882,7 @@ class _SessionItemState extends State<SessionItem> {
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
                         Text(
-                          widget.session.startTime.day.toString(),
+                          session.startTime.day.toString(),
                           style: TextStyle(
                             color: useDarkMode
                                 ? Colors.white
@@ -910,7 +891,7 @@ class _SessionItemState extends State<SessionItem> {
                           ),
                         ),
                         Text(
-                          months[widget.session.startTime.month - 1],
+                          months[session.startTime.month - 1],
                           style: TextStyle(
                             color: useDarkMode
                                 ? Colors.white
@@ -940,8 +921,7 @@ class _SessionItemState extends State<SessionItem> {
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
                         Text(
-                          sessionsAbbreviations[
-                              widget.session.sessionsAbbreviation],
+                          sessionsAbbreviations[session.sessionsAbbreviation],
                           style: TextStyle(
                             color: useDarkMode
                                 ? Colors.white
@@ -949,7 +929,7 @@ class _SessionItemState extends State<SessionItem> {
                             fontSize: 20,
                           ),
                         ),
-                        widget.session.endTime.isBefore(DateTime.now())
+                        session.endTime.isBefore(DateTime.now())
                             ? Row(
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 children: [
@@ -980,7 +960,7 @@ class _SessionItemState extends State<SessionItem> {
                                   ),
                                 ],
                               )
-                            : widget.session.startTime.isBefore(DateTime.now())
+                            : session.startTime.isBefore(DateTime.now())
                                 ? Row(
                                     mainAxisAlignment: MainAxisAlignment.center,
                                     children: [
@@ -1033,8 +1013,8 @@ class _SessionItemState extends State<SessionItem> {
               context,
               MaterialPageRoute(
                 builder: (context) => SessionScreen(
-                  sessionsAbbreviations[widget.session.sessionsAbbreviation],
-                  widget.session,
+                  sessionsAbbreviations[session.sessionsAbbreviation],
+                  session,
                 ),
               ),
             ),
diff --git a/lib/Screens/home.dart b/lib/Screens/home.dart
index 480efb10..739741c7 100644
--- a/lib/Screens/home.dart
+++ b/lib/Screens/home.dart
@@ -21,18 +21,9 @@ import 'package:boxbox/helpers/live_session_status_indicator.dart';
 import 'package:boxbox/helpers/news_feed_widget.dart';
 import 'package:flutter/material.dart';
 
-class HomeScreen extends StatefulWidget {
+class HomeScreen extends StatelessWidget {
   final ScrollController _scrollController;
   const HomeScreen(this._scrollController, {Key? key}) : super(key: key);
-  @override
-  State<HomeScreen> createState() => _HomeScreenState();
-}
-
-class _HomeScreenState extends State<HomeScreen> {
-  @override
-  void initState() {
-    super.initState();
-  }
 
   @override
   Widget build(BuildContext context) {
@@ -53,7 +44,7 @@ class _HomeScreenState extends State<HomeScreen> {
                         : width > 576
                             ? 576
                             : width,
-            child: NewsFeedWidget(scrollController: widget._scrollController),
+            child: NewsFeed(scrollController: _scrollController),
           ),
         ],
       ),
diff --git a/lib/Screens/race_details.dart b/lib/Screens/race_details.dart
index 9dec2f43..d9208cd8 100644
--- a/lib/Screens/race_details.dart
+++ b/lib/Screens/race_details.dart
@@ -42,7 +42,7 @@ import 'package:hive_flutter/hive_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:youtube_explode_dart/youtube_explode_dart.dart';
 
-class RaceDetailsScreen extends StatefulWidget {
+class RaceDetailsScreen extends StatelessWidget {
   final Race race;
   final bool hasSprint;
   final int? tab;
@@ -50,14 +50,8 @@ class RaceDetailsScreen extends StatefulWidget {
   const RaceDetailsScreen(this.race, this.hasSprint, {Key? key, this.tab})
       : super(key: key);
 
-  @override
-  State<RaceDetailsScreen> createState() => _RaceDetailsScreenState();
-}
-
-class _RaceDetailsScreenState extends State<RaceDetailsScreen> {
   @override
   Widget build(BuildContext context) {
-    final Race race = widget.race;
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
 
@@ -67,10 +61,10 @@ class _RaceDetailsScreenState extends State<RaceDetailsScreen> {
             : Colors.white,
         body: DefaultTabController(
           length: 3,
-          initialIndex: widget.tab != null
-              ? widget.tab == 10
+          initialIndex: tab != null
+              ? tab == 10
                   ? 2
-                  : widget.tab!
+                  : tab!
               : 0,
           child: Builder(
             builder: (BuildContext context) {
@@ -93,7 +87,7 @@ class _RaceDetailsScreenState extends State<RaceDetailsScreen> {
                     SliverPersistentHeader(
                       delegate: _SliverAppBarDelegate(
                         TabBar(
-                          tabs: widget.hasSprint
+                          tabs: hasSprint
                               ? <Widget>[
                                   Tab(
                                     text: AppLocalizations.of(context)!
@@ -134,13 +128,13 @@ class _RaceDetailsScreenState extends State<RaceDetailsScreen> {
                     ),
                   ];
                 },
-                body: widget.hasSprint
+                body: hasSprint
                     ? TabBarView(
                         children: [
-                          FreePracticesResultsProvider(race, widget.hasSprint),
+                          FreePracticesResultsProvider(race, hasSprint),
                           DefaultTabController(
                             length: 2,
-                            initialIndex: widget.tab == 10 ? 1 : 0,
+                            initialIndex: tab == 10 ? 1 : 0,
                             child: Column(
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
@@ -167,8 +161,8 @@ class _RaceDetailsScreenState extends State<RaceDetailsScreen> {
                                         child: SingleChildScrollView(
                                           child: QualificationResultsProvider(
                                             raceUrl:
-                                                'https://www.formula1.com/en/results.html/2023/races/${Convert().circuitIdFromErgastToFormulaOne(widget.race.circuitId)}/${Convert().circuitNameFromErgastToFormulaOne(widget.race.circuitId)}/sprint-shootout.html',
-                                            hasSprint: widget.hasSprint,
+                                                'https://www.formula1.com/en/results.html/2023/races/${Convert().circuitIdFromErgastToFormulaOne(race.circuitId)}/${Convert().circuitNameFromErgastToFormulaOne(race.circuitId)}/sprint-shootout.html',
+                                            hasSprint: hasSprint,
                                           ),
                                         ),
                                       ),
@@ -185,7 +179,7 @@ class _RaceDetailsScreenState extends State<RaceDetailsScreen> {
                           ),
                           DefaultTabController(
                             length: 2,
-                            initialIndex: widget.tab == 10 ? 1 : 0,
+                            initialIndex: tab == 10 ? 1 : 0,
                             child: Column(
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
@@ -214,7 +208,7 @@ class _RaceDetailsScreenState extends State<RaceDetailsScreen> {
                                         child: SingleChildScrollView(
                                           child: QualificationResultsProvider(
                                             race: race,
-                                            hasSprint: widget.hasSprint,
+                                            hasSprint: hasSprint,
                                           ),
                                         ),
                                       ),
@@ -229,12 +223,12 @@ class _RaceDetailsScreenState extends State<RaceDetailsScreen> {
                       )
                     : TabBarView(
                         children: [
-                          FreePracticesResultsProvider(race, widget.hasSprint),
+                          FreePracticesResultsProvider(race, hasSprint),
                           SafeArea(
                             child: SingleChildScrollView(
                               child: QualificationResultsProvider(
                                 race: race,
-                                hasSprint: widget.hasSprint,
+                                hasSprint: hasSprint,
                               ),
                             ),
                           ),
@@ -438,6 +432,7 @@ class _RaceResultsProviderState extends State<RaceResultsProvider> {
         race,
         4,
         AppLocalizations.of(context)!.race,
+        update: setState,
       );
     } else {
       return raceUrl != ''
@@ -619,7 +614,20 @@ class _RaceResultsProviderState extends State<RaceResultsProvider> {
   }
 }
 
-class SprintResultsProvider extends StatelessWidget {
+class SprintResultsProvider extends StatefulWidget {
+  final Race? race;
+  final String? raceUrl;
+  const SprintResultsProvider({
+    Key? key,
+    this.race,
+    this.raceUrl,
+  }) : super(key: key);
+
+  @override
+  State<SprintResultsProvider> createState() => _SprintResultsProviderState();
+}
+
+class _SprintResultsProviderState extends State<SprintResultsProvider> {
   Future<List<DriverResult>> getSprintStandings(
     String round,
   ) async {
@@ -628,29 +636,22 @@ class SprintResultsProvider extends StatelessWidget {
     );
   }
 
-  final Race? race;
-  final String? raceUrl;
-  const SprintResultsProvider({
-    Key? key,
-    this.race,
-    this.raceUrl,
-  }) : super(key: key);
   @override
   Widget build(BuildContext context) {
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
     return SingleChildScrollView(
       child: FutureBuilder<List<DriverResult>>(
-        future: raceUrl != null
+        future: widget.raceUrl != null
             ? FormulaOneScraper().scrapeRaceResult(
                 '',
                 0,
                 '',
                 false,
-                raceUrl: raceUrl!,
+                raceUrl: widget.raceUrl!,
               )
             : getSprintStandings(
-                race!.round,
+                widget.race!.round,
               ),
         builder: (context, snapshot) => snapshot.hasError
             ? Padding(
@@ -669,9 +670,10 @@ class SprintResultsProvider extends StatelessWidget {
             : snapshot.hasData
                 ? snapshot.data!.isEmpty
                     ? SessionCountdownTimer(
-                        race,
+                        widget.race,
                         2,
                         AppLocalizations.of(context)!.sprint,
+                        update: setState,
                       )
                     : Column(
                         children: [
@@ -690,10 +692,11 @@ class SprintResultsProvider extends StatelessWidget {
                               ),
                               onTap: () async {
                                 var yt = YoutubeExplode();
-                                final raceYear = race!.date.split('-')[0];
+                                final raceYear =
+                                    widget.race!.date.split('-')[0];
                                 final List<Video> searchResults =
                                     await yt.search.search(
-                                  "Formula 1 Sprint Highlights ${race!.raceName} $raceYear",
+                                  "Formula 1 Sprint Highlights ${widget.race!.raceName} $raceYear",
                                 );
                                 final Video bestVideoMatch = searchResults[0];
                                 await launchUrl(
@@ -716,15 +719,7 @@ class SprintResultsProvider extends StatelessWidget {
   }
 }
 
-class QualificationResultsProvider extends StatelessWidget {
-  Future<List<DriverQualificationResult>> getQualificationStandings(
-    String round,
-  ) async {
-    return await ErgastApi().getQualificationStandings(
-      round,
-    );
-  }
-
+class QualificationResultsProvider extends StatefulWidget {
   final Race? race;
   final String? raceUrl;
   final bool? hasSprint;
@@ -736,33 +731,50 @@ class QualificationResultsProvider extends StatelessWidget {
     this.hasSprint,
     this.isSprintShootout,
   }) : super(key: key);
+
+  @override
+  State<QualificationResultsProvider> createState() =>
+      _QualificationResultsProviderState();
+}
+
+class _QualificationResultsProviderState
+    extends State<QualificationResultsProvider> {
+  Future<List<DriverQualificationResult>> getQualificationStandings(
+    String round,
+  ) async {
+    return await ErgastApi().getQualificationStandings(
+      round,
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
     return FutureBuilder<List<DriverQualificationResult>>(
-      future: raceUrl != null
+      future: widget.raceUrl != null
           ? FormulaOneScraper().scrapeQualifyingResults(
               '',
               0,
               '',
               false,
-              qualifyingResultsUrl: raceUrl!,
-              hasSprint: hasSprint,
+              qualifyingResultsUrl: widget.raceUrl!,
+              hasSprint: widget.hasSprint,
             )
           : getQualificationStandings(
-              race!.round,
+              widget.race!.round,
             ),
       builder: (context, snapshot) => snapshot.hasError
-          ? (race?.sessionDates.isNotEmpty ?? false) &&
-                  (race?.sessionDates.last.isBefore(
+          ? (widget.race?.sessionDates.isNotEmpty ?? false) &&
+                  (widget.race?.sessionDates.last.isBefore(
                         DateTime.now(),
                       ) ??
                       false)
               ? SessionCountdownTimer(
-                  race,
+                  widget.race,
                   3,
                   AppLocalizations.of(context)!.qualifyings,
+                  update: setState,
                 )
               : Padding(
                   padding: const EdgeInsets.all(15),
@@ -796,14 +808,14 @@ class QualificationResultsProvider extends StatelessWidget {
                             ),
                             onTap: () async {
                               var yt = YoutubeExplode();
-                              final raceYear = race!.date.split('-')[0];
+                              final raceYear = widget.race!.date.split('-')[0];
                               final List<Video> searchResults =
                                   await yt.search.search(
-                                (raceUrl?.contains('sprint-shootout') ??
+                                (widget.raceUrl?.contains('sprint-shootout') ??
                                             false) ||
-                                        (isSprintShootout ?? false)
-                                    ? "Formula 1 Sprint Shootout Highlights ${race!.raceName} $raceYear"
-                                    : "Formula 1 Qualification Highlights ${race!.raceName} $raceYear",
+                                        (widget.isSprintShootout ?? false)
+                                    ? "Formula 1 Sprint Shootout Highlights ${widget.race!.raceName} $raceYear"
+                                    : "Formula 1 Qualification Highlights ${widget.race!.raceName} $raceYear",
                               );
                               final Video bestVideoMatch = searchResults[0];
                               await launchUrl(
@@ -821,7 +833,7 @@ class QualificationResultsProvider extends StatelessWidget {
                         ),
                       ],
                     )
-                  : race!.sessionDates[3].isBefore(DateTime.now())
+                  : widget.race!.sessionDates[3].isBefore(DateTime.now())
                       ? Padding(
                           padding: const EdgeInsets.all(10),
                           child: Center(
@@ -836,9 +848,10 @@ class QualificationResultsProvider extends StatelessWidget {
                           ),
                         )
                       : SessionCountdownTimer(
-                          race,
+                          widget.race,
                           3,
                           AppLocalizations.of(context)!.qualifyings,
+                          update: setState,
                         )
               : const LoadingIndicatorUtil(),
     );
diff --git a/lib/Screens/standings.dart b/lib/Screens/standings.dart
index e4e3c41f..bd78154a 100644
--- a/lib/Screens/standings.dart
+++ b/lib/Screens/standings.dart
@@ -28,7 +28,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
-class StandingsScreen extends StatefulWidget {
+class StandingsScreen extends StatelessWidget {
   final bool? switchToTeamStandings;
   final ScrollController? scrollController;
   const StandingsScreen({
@@ -37,26 +37,21 @@ class StandingsScreen extends StatefulWidget {
     this.scrollController,
   }) : super(key: key);
 
-  @override
-  State<StandingsScreen> createState() => _StandingsScreenState();
-}
-
-class _StandingsScreenState extends State<StandingsScreen> {
   @override
   Widget build(BuildContext context) {
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
     return DefaultTabController(
       length: 2,
-      initialIndex: widget.switchToTeamStandings != null ? 1 : 0,
+      initialIndex: switchToTeamStandings != null ? 1 : 0,
       child: Scaffold(
         backgroundColor: useDarkMode
             ? Theme.of(context).scaffoldBackgroundColor
             : Colors.white,
         body: TabBarView(
           children: [
-            DriversStandingsWidget(scrollController: widget.scrollController),
-            TeamsStandingsWidget(scrollController: widget.scrollController),
+            DriversStandingsWidget(scrollController: scrollController),
+            TeamsStandingsWidget(scrollController: scrollController),
           ],
         ),
         appBar: PreferredSize(
diff --git a/lib/Screens/team_details.dart b/lib/Screens/team_details.dart
index f05ab187..63f40e83 100644
--- a/lib/Screens/team_details.dart
+++ b/lib/Screens/team_details.dart
@@ -20,10 +20,11 @@
 import 'package:boxbox/Screens/race_details.dart';
 import 'package:boxbox/api/driver_components.dart';
 import 'package:boxbox/api/ergast.dart';
-import 'package:boxbox/api/news.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/helpers/convert_ergast_and_formula_one.dart';
 import 'package:boxbox/helpers/custom_physics.dart';
 import 'package:boxbox/helpers/driver_result_item.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:boxbox/scraping/formula_one.dart';
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
@@ -227,7 +228,7 @@ class TeamDetailsFragment extends StatelessWidget {
                 ),
                 itemCount: teamDetails["articles"].length,
                 itemBuilder: (context, index) => FutureBuilder<Article>(
-                  future: F1NewsFetcher()
+                  future: Formula1()
                       .getArticleData(teamDetails["articles"][index][0]),
                   builder: (context, snapshot) {
                     return snapshot.hasError
diff --git a/lib/Screens/video.dart b/lib/Screens/video.dart
index a5dd3f2c..1b29911a 100644
--- a/lib/Screens/video.dart
+++ b/lib/Screens/video.dart
@@ -17,8 +17,8 @@
  * Copyright (c) 2022-2023, BrightDV
  */
 
-import 'package:boxbox/api/news.dart';
 import 'package:boxbox/api/videos.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:flutter/material.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:marquee/marquee.dart';
diff --git a/lib/Screens/videos.dart b/lib/Screens/videos.dart
index 885c0f67..5883dba5 100644
--- a/lib/Screens/videos.dart
+++ b/lib/Screens/videos.dart
@@ -169,20 +169,15 @@ class _VideosScreenState extends State<VideosScreen> {
   }
 }
 
-class VideosHeader extends StatefulWidget {
+class VideosHeader extends StatelessWidget {
   final List<VideoItem> videos;
-  const VideosHeader(this.videos, {Key? key}) : super(key: key);
+  VideosHeader(this.videos, {Key? key}) : super(key: key);
 
-  @override
-  State<VideosHeader> createState() => _VideosHeaderState();
-}
-
-class _VideosHeaderState extends State<VideosHeader> {
   final StoryController controller = StoryController();
   @override
   Widget build(BuildContext context) {
     List<StoryItem> storyItems = [];
-    for (var video in widget.videos) {
+    for (var video in videos) {
       storyItems.add(
         StoryItem(
           video,
@@ -203,7 +198,7 @@ class _VideosHeaderState extends State<VideosHeader> {
   }
 }
 
-class VideosList extends StatefulWidget {
+class VideosList extends StatelessWidget {
   final List<Video> videos;
   final bool verticalScroll;
   const VideosList(
@@ -212,27 +207,22 @@ class VideosList extends StatefulWidget {
     Key? key,
   }) : super(key: key);
 
-  @override
-  State<VideosList> createState() => _VideosListState();
-}
-
-class _VideosListState extends State<VideosList> {
   @override
   Widget build(BuildContext context) {
     return ListView.builder(
-      scrollDirection: widget.verticalScroll ? Axis.vertical : Axis.horizontal,
-      itemCount: widget.videos.length,
+      scrollDirection: verticalScroll ? Axis.vertical : Axis.horizontal,
+      itemCount: videos.length,
       shrinkWrap: true,
       physics: const NeverScrollableScrollPhysics(),
       itemBuilder: (context, index) => VideoItem(
         index,
-        widget.videos,
+        videos,
       ),
     );
   }
 }
 
-class VideoItem extends StatefulWidget {
+class VideoItem extends StatelessWidget {
   final int index;
   final List<Video> videos;
   const VideoItem(
@@ -241,14 +231,8 @@ class VideoItem extends StatefulWidget {
     Key? key,
   }) : super(key: key);
 
-  @override
-  State<VideoItem> createState() => _VideoItemState();
-}
-
-class _VideoItemState extends State<VideoItem> {
   @override
   Widget build(BuildContext context) {
-    List<Video> videos = widget.videos;
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
     return Padding(
@@ -278,7 +262,7 @@ class _VideoItemState extends State<VideoItem> {
                       control: SwiperControl(
                         disableColor: Theme.of(context).primaryColor,
                       ),
-                      index: widget.index,
+                      index: index,
                       loop: false,
                     ),
                     closedBuilder: (context, action) => Stack(
@@ -289,7 +273,7 @@ class _VideoItemState extends State<VideoItem> {
                             Radius.circular(10),
                           ),
                           child: CachedNetworkImage(
-                            imageUrl: videos[widget.index].thumbnailUrl,
+                            imageUrl: videos[index].thumbnailUrl,
                             placeholder: (context, url) => SizedBox(
                               height:
                                   MediaQuery.of(context).size.width / (16 / 9) -
@@ -331,7 +315,7 @@ class _VideoItemState extends State<VideoItem> {
                                   bottom: 2,
                                 ),
                                 child: Text(
-                                  videos[widget.index].videoDuration,
+                                  videos[index].videoDuration,
                                   style: const TextStyle(
                                     color: Colors.white,
                                   ),
@@ -342,7 +326,7 @@ class _VideoItemState extends State<VideoItem> {
                                   left: 5,
                                 ),
                                 child: Text(
-                                  videos[widget.index].caption,
+                                  videos[index].caption,
                                   maxLines: 2,
                                   overflow: TextOverflow.ellipsis,
                                   style: const TextStyle(
@@ -381,7 +365,7 @@ class _VideoItemState extends State<VideoItem> {
                   control: SwiperControl(
                     disableColor: Theme.of(context).primaryColor,
                   ),
-                  index: widget.index,
+                  index: index,
                   loop: false,
                 ),
                 closedBuilder: (context, action) => Stack(
@@ -392,7 +376,7 @@ class _VideoItemState extends State<VideoItem> {
                         Radius.circular(10),
                       ),
                       child: CachedNetworkImage(
-                        imageUrl: videos[widget.index].thumbnailUrl,
+                        imageUrl: videos[index].thumbnailUrl,
                         placeholder: (context, url) => SizedBox(
                           height:
                               MediaQuery.of(context).size.width / (16 / 9) - 7,
@@ -433,7 +417,7 @@ class _VideoItemState extends State<VideoItem> {
                               bottom: 2,
                             ),
                             child: Text(
-                              videos[widget.index].videoDuration,
+                              videos[index].videoDuration,
                               style: const TextStyle(
                                 color: Colors.white,
                               ),
@@ -444,7 +428,7 @@ class _VideoItemState extends State<VideoItem> {
                               left: 5,
                             ),
                             child: Text(
-                              videos[widget.index].caption,
+                              videos[index].caption,
                               maxLines: 2,
                               overflow: TextOverflow.ellipsis,
                               style: const TextStyle(
diff --git a/lib/api/article_parts.dart b/lib/api/article_parts.dart
index fec63051..afdcf7bf 100644
--- a/lib/api/article_parts.dart
+++ b/lib/api/article_parts.dart
@@ -20,8 +20,9 @@
 import 'package:boxbox/Screens/article.dart';
 import 'package:boxbox/Screens/free_practice_screen.dart';
 import 'package:boxbox/Screens/race_details.dart';
-import 'package:boxbox/api/news.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/helpers/custom_physics.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:boxbox/helpers/news_feed_widget.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
@@ -245,7 +246,7 @@ class WidgetsList extends StatelessWidget {
                               backgroundColor: useDarkMode
                                   ? Theme.of(context).scaffoldBackgroundColor
                                   : Colors.white,
-                              body: NewsFeedWidget(tagId: tag['id']),
+                              body: NewsFeed(tagId: tag['id']),
                             ),
                           ),
                         );
diff --git a/lib/api/ergast.dart b/lib/api/ergast.dart
index 344c4ea8..805733ba 100644
--- a/lib/api/ergast.dart
+++ b/lib/api/ergast.dart
@@ -298,7 +298,7 @@ class _ErgastApiCalls {
               element['round'],
               element['raceName'],
               element['date'],
-              element['time'],
+              element['time'] ?? '15:00:00Z', // temporary time
               element['Circuit']['circuitId'],
               element['Circuit']['circuitName'],
               element['Circuit']['url'],
diff --git a/lib/api/formula1.dart b/lib/api/formula1.dart
new file mode 100644
index 00000000..ae239386
--- /dev/null
+++ b/lib/api/formula1.dart
@@ -0,0 +1,218 @@
+/*
+ *  This file is part of BoxBox (https://github.com/BrightDV/BoxBox).
+ * 
+ * BoxBox is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * BoxBox is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with BoxBox.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Copyright (c) 2022-2023, BrightDV
+ */
+
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:hive_flutter/hive_flutter.dart';
+import 'package:http/http.dart' as http;
+
+class Formula1 {
+  final String defaultEndpoint = "https://api.formula1.com";
+  final String apikey = "qPgPPRJyGCIPxFT3el4MF7thXHyJCzAP";
+
+  List<News> formatResponse(Map responseAsJson) {
+    List finalJson = responseAsJson['items'];
+    List<News> newsList = [];
+    bool useDataSaverMode = Hive.box('settings')
+        .get('useDataSaverMode', defaultValue: false) as bool;
+
+    for (var element in finalJson) {
+      element['title'] = element['title'].replaceAll("\n", "");
+      if (element['metaDescription'] != null) {
+        element['metaDescription'] =
+            element['metaDescription'].replaceAll("\n", "");
+      }
+      String imageUrl = "";
+      if (element['thumbnail'] != null) {
+        imageUrl = element['thumbnail']['image']['url'];
+        if (useDataSaverMode) {
+          if (element['thumbnail']['image']['renditions'] != null) {
+            imageUrl =
+                element['thumbnail']['image']['renditions']['2col-retina'];
+          } else {
+            imageUrl += '.transform/2col-retina/image.jpg';
+          }
+        }
+      }
+      newsList.add(
+        News(
+          element['id'],
+          element['articleType'],
+          element['slug'],
+          element['title'],
+          element['metaDescription'] ?? '',
+          DateTime.parse(element['updatedAt']),
+          imageUrl,
+        ),
+      );
+    }
+    return newsList;
+  }
+
+  FutureOr<List<News>> getMoreNews(
+    int offset, {
+    String? tagId,
+    String? articleType,
+  }) async {
+    Uri url;
+    String endpoint = Hive.box('settings')
+        .get('server', defaultValue: defaultEndpoint) as String;
+    if (tagId != null) {
+      url = Uri.parse(
+          '$endpoint/v1/editorial/articles?limit=16&offset=$offset&tags=$tagId');
+    } else if (articleType != null) {
+      url = Uri.parse(
+          '$endpoint/v1/editorial/articles?limit=16&offset=$offset&articleTypes=$articleType');
+    } else {
+      url =
+          Uri.parse('$endpoint/v1/editorial/articles?limit=16&offset=$offset');
+    }
+    var response = await http.get(
+      url,
+      headers: endpoint != defaultEndpoint
+          ? {
+              "Accept": "application/json",
+            }
+          : {
+              "Accept": "application/json",
+              "apikey": apikey,
+              "locale": "en",
+            },
+    );
+
+    Map<String, dynamic> responseAsJson =
+        json.decode(utf8.decode(response.bodyBytes));
+    if (offset == 0 && tagId == null && articleType == null) {
+      Hive.box('requests').put('news', responseAsJson);
+    }
+    return formatResponse(responseAsJson);
+  }
+
+  Future<Map<String, dynamic>> getRawPersonalizedFeed(
+    List tags, {
+    String? articleType,
+  }) async {
+    Uri url;
+    String endpoint = Hive.box('settings')
+        .get('server', defaultValue: defaultEndpoint) as String;
+    if (articleType != null) {
+      url = Uri.parse(
+        '$endpoint/v1/editorial/articles?limit=16&tags=${tags.join(',')}&articleTypes=$articleType',
+      );
+    } else {
+      url = Uri.parse(
+          '$endpoint/v1/editorial/articles?limit=16&tags=${tags.join(',')}');
+    }
+    var response = await http.get(
+      url,
+      headers: endpoint != defaultEndpoint
+          ? {
+              "Accept": "application/json",
+            }
+          : {
+              "Accept": "application/json",
+              "apikey": apikey,
+              "locale": "en",
+            },
+    );
+
+    Map<String, dynamic> responseAsJson =
+        json.decode(utf8.decode(response.bodyBytes));
+    return responseAsJson;
+  }
+
+  Future<Article> getArticleData(String articleId) async {
+    String endpoint = Hive.box('settings')
+        .get('server', defaultValue: defaultEndpoint) as String;
+    Uri url = Uri.parse('$endpoint/v1/editorial/articles/$articleId');
+    var response = await http.get(
+      url,
+      headers: endpoint != defaultEndpoint
+          ? {
+              "Accept": "application/json",
+            }
+          : {
+              "Accept": "application/json",
+              "apikey": apikey,
+              "locale": "en",
+            },
+    );
+    Map<String, dynamic> responseAsJson = json.decode(
+      utf8.decode(response.bodyBytes),
+    );
+
+    Article article = Article(
+      responseAsJson['id'],
+      responseAsJson['slug'],
+      responseAsJson['title'],
+      DateTime.parse(responseAsJson['createdAt']),
+      responseAsJson['articleTags'],
+      responseAsJson['hero'] ?? {},
+      responseAsJson['body'],
+      responseAsJson['relatedArticles'],
+      responseAsJson['author'] ?? {},
+    );
+    return article;
+  }
+}
+
+class News {
+  final String newsId;
+  final String newsType;
+  final String slug;
+  final String title;
+  final String subtitle;
+  final DateTime datePosted;
+  final String imageUrl;
+
+  News(
+    this.newsId,
+    this.newsType,
+    this.slug,
+    this.title,
+    this.subtitle,
+    this.datePosted,
+    this.imageUrl,
+  );
+}
+
+class Article {
+  final String articleId;
+  final String articleSlug;
+  final String articleName;
+  final DateTime publishedDate;
+  final List articleTags;
+  final Map articleHero;
+  final List articleContent;
+  final List relatedArticles;
+  final Map authorDetails;
+
+  Article(
+    this.articleId,
+    this.articleSlug,
+    this.articleName,
+    this.publishedDate,
+    this.articleTags,
+    this.articleHero,
+    this.articleContent,
+    this.relatedArticles,
+    this.authorDetails,
+  );
+}
diff --git a/lib/api/race_components.dart b/lib/api/race_components.dart
index 356df199..c03ff6b0 100644
--- a/lib/api/race_components.dart
+++ b/lib/api/race_components.dart
@@ -18,8 +18,8 @@
  */
 
 // import 'package:awesome_notifications/awesome_notifications.dart';
-import 'package:boxbox/api/news.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:boxbox/helpers/racetracks_url.dart';
 import 'package:boxbox/Screens/circuit.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/helpers/bottom_navigation_bar.dart b/lib/helpers/bottom_navigation_bar.dart
index 6d53eec1..20409d40 100644
--- a/lib/helpers/bottom_navigation_bar.dart
+++ b/lib/helpers/bottom_navigation_bar.dart
@@ -242,7 +242,7 @@ class _MainBottomNavigationBarState extends State<MainBottomNavigationBar> {
                               backgroundColor: useDarkMode
                                   ? Theme.of(context).scaffoldBackgroundColor
                                   : Colors.white,
-                              body: NewsFeedWidget(
+                              body: NewsFeed(
                                 articleType: filterItems[pressed],
                               ),
                             ),
diff --git a/lib/helpers/drawer.dart b/lib/helpers/drawer.dart
index a97f384b..dc4a6ff6 100644
--- a/lib/helpers/drawer.dart
+++ b/lib/helpers/drawer.dart
@@ -31,22 +31,17 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
-class MainDrawer extends StatefulWidget {
+class MainDrawer extends StatelessWidget {
   final Function homeSetState;
-  const MainDrawer(this.homeSetState, {Key? key}) : super(key: key);
-
-  @override
-  State<MainDrawer> createState() => _MainDrawerState();
-}
-
-class _MainDrawerState extends State<MainDrawer> {
-  bool useDarkMode =
-      Hive.box('settings').get('darkMode', defaultValue: true) as bool;
-  bool enableExperimentalFeatures = Hive.box('settings')
-      .get('enableExperimentalFeatures', defaultValue: false) as bool;
+  MainDrawer(this.homeSetState, {Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    bool useDarkMode =
+        Hive.box('settings').get('darkMode', defaultValue: true) as bool;
+    bool enableExperimentalFeatures = Hive.box('settings')
+        .get('enableExperimentalFeatures', defaultValue: false) as bool;
+
     return Theme(
       data: Theme.of(context).copyWith(
         canvasColor: useDarkMode
@@ -172,7 +167,7 @@ class _MainDrawerState extends State<MainDrawer> {
                   context,
                   MaterialPageRoute(
                     builder: (context) => SettingsScreen(
-                      widget.homeSetState,
+                      homeSetState,
                     ),
                   ),
                 );
diff --git a/lib/api/news.dart b/lib/helpers/news.dart
similarity index 91%
rename from lib/api/news.dart
rename to lib/helpers/news.dart
index 90316bf9..55bd7da6 100644
--- a/lib/api/news.dart
+++ b/lib/helpers/news.dart
@@ -24,6 +24,7 @@ import 'package:better_player/better_player.dart';
 import 'package:boxbox/Screens/circuit.dart';
 import 'package:boxbox/Screens/schedule.dart';
 import 'package:boxbox/api/brightcove.dart';
+import 'package:boxbox/api/formula1.dart';
 import 'package:boxbox/api/race_components.dart';
 import 'package:boxbox/helpers/hover.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
@@ -40,208 +41,13 @@ import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:timeago/timeago.dart' as timeago;
 import 'package:url_launcher/url_launcher.dart';
 
-class F1NewsFetcher {
-  final String defaultEndpoint = "https://api.formula1.com";
-  final String apikey = "qPgPPRJyGCIPxFT3el4MF7thXHyJCzAP";
-
-  List<News> formatResponse(Map responseAsJson) {
-    List finalJson = responseAsJson['items'];
-    List<News> newsList = [];
-    bool useDataSaverMode = Hive.box('settings')
-        .get('useDataSaverMode', defaultValue: false) as bool;
-
-    for (var element in finalJson) {
-      element['title'] = element['title'].replaceAll("\n", "");
-      if (element['metaDescription'] != null) {
-        element['metaDescription'] =
-            element['metaDescription'].replaceAll("\n", "");
-      }
-      String imageUrl = "";
-      if (element['thumbnail'] != null) {
-        imageUrl = element['thumbnail']['image']['url'];
-        if (useDataSaverMode) {
-          if (element['thumbnail']['image']['renditions'] != null) {
-            imageUrl =
-                element['thumbnail']['image']['renditions']['2col-retina'];
-          } else {
-            imageUrl += '.transform/2col-retina/image.jpg';
-          }
-        }
-      }
-      newsList.add(
-        News(
-          element['id'],
-          element['articleType'],
-          element['slug'],
-          element['title'],
-          element['metaDescription'] ?? '',
-          DateTime.parse(element['updatedAt']),
-          imageUrl,
-        ),
-      );
-    }
-    return newsList;
-  }
-
-  FutureOr<List<News>> getMoreNews(
-    int offset, {
-    String? tagId,
-    String? articleType,
-  }) async {
-    Uri url;
-    String endpoint = Hive.box('settings')
-        .get('server', defaultValue: defaultEndpoint) as String;
-    if (tagId != null) {
-      url = Uri.parse(
-          '$endpoint/v1/editorial/articles?limit=16&offset=$offset&tags=$tagId');
-    } else if (articleType != null) {
-      url = Uri.parse(
-          '$endpoint/v1/editorial/articles?limit=16&offset=$offset&articleTypes=$articleType');
-    } else {
-      url =
-          Uri.parse('$endpoint/v1/editorial/articles?limit=16&offset=$offset');
-    }
-    var response = await http.get(
-      url,
-      headers: endpoint != defaultEndpoint
-          ? {
-              "Accept": "application/json",
-            }
-          : {
-              "Accept": "application/json",
-              "apikey": apikey,
-              "locale": "en",
-            },
-    );
-
-    Map<String, dynamic> responseAsJson =
-        json.decode(utf8.decode(response.bodyBytes));
-    if (offset == 0 && tagId == null && articleType == null) {
-      Hive.box('requests').put('news', responseAsJson);
-    }
-    return formatResponse(responseAsJson);
-  }
-
-  Future<Map<String, dynamic>> getRawPersonalizedFeed(
-    List tags, {
-    String? articleType,
-  }) async {
-    Uri url;
-    String endpoint = Hive.box('settings')
-        .get('server', defaultValue: defaultEndpoint) as String;
-    if (articleType != null) {
-      url = Uri.parse(
-        '$endpoint/v1/editorial/articles?limit=16&tags=${tags.join(',')}&articleTypes=$articleType',
-      );
-    } else {
-      url = Uri.parse(
-          '$endpoint/v1/editorial/articles?limit=16&tags=${tags.join(',')}');
-    }
-    var response = await http.get(
-      url,
-      headers: endpoint != defaultEndpoint
-          ? {
-              "Accept": "application/json",
-            }
-          : {
-              "Accept": "application/json",
-              "apikey": apikey,
-              "locale": "en",
-            },
-    );
-
-    Map<String, dynamic> responseAsJson =
-        json.decode(utf8.decode(response.bodyBytes));
-    return responseAsJson;
-  }
-
-  Future<Article> getArticleData(String articleId) async {
-    String endpoint = Hive.box('settings')
-        .get('server', defaultValue: defaultEndpoint) as String;
-    Uri url = Uri.parse('$endpoint/v1/editorial/articles/$articleId');
-    var response = await http.get(
-      url,
-      headers: endpoint != defaultEndpoint
-          ? {
-              "Accept": "application/json",
-            }
-          : {
-              "Accept": "application/json",
-              "apikey": apikey,
-              "locale": "en",
-            },
-    );
-    Map<String, dynamic> responseAsJson = json.decode(
-      utf8.decode(response.bodyBytes),
-    );
-
-    Article article = Article(
-      responseAsJson['id'],
-      responseAsJson['slug'],
-      responseAsJson['title'],
-      DateTime.parse(responseAsJson['createdAt']),
-      responseAsJson['articleTags'],
-      responseAsJson['hero'] ?? {},
-      responseAsJson['body'],
-      responseAsJson['relatedArticles'],
-      responseAsJson['author'] ?? {},
-    );
-    return article;
-  }
-}
-
-class News {
-  final String newsId;
-  final String newsType;
-  final String slug;
-  final String title;
-  final String subtitle;
-  final DateTime datePosted;
-  final String imageUrl;
-
-  News(
-    this.newsId,
-    this.newsType,
-    this.slug,
-    this.title,
-    this.subtitle,
-    this.datePosted,
-    this.imageUrl,
-  );
-}
-
-class Article {
-  final String articleId;
-  final String articleSlug;
-  final String articleName;
-  final DateTime publishedDate;
-  final List articleTags;
-  final Map articleHero;
-  final List articleContent;
-  final List relatedArticles;
-  final Map authorDetails;
-
-  Article(
-    this.articleId,
-    this.articleSlug,
-    this.articleName,
-    this.publishedDate,
-    this.articleTags,
-    this.articleHero,
-    this.articleContent,
-    this.relatedArticles,
-    this.authorDetails,
-  );
-}
-
-class NewsItem extends StatefulWidget {
+class NewsItem extends StatelessWidget {
   final News item;
   final bool inRelated;
   final bool? showSmallDescription;
@@ -256,18 +62,12 @@ class NewsItem extends StatefulWidget {
     this.width,
     this.itemPerRow = 1,
   }) : super(key: key);
-  @override
-  State<NewsItem> createState() => _NewsItemState();
-}
 
-class _NewsItemState extends State<NewsItem> with TickerProviderStateMixin {
   final String endpoint = 'https://formula1.com';
   final String articleLink = '/en/latest/article.';
 
   @override
   Widget build(BuildContext context) {
-    final News item = widget.item;
-    final bool inRelated = widget.inRelated;
     String imageUrl = item.imageUrl;
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
@@ -573,13 +373,10 @@ class _NewsItemState extends State<NewsItem> with TickerProviderStateMixin {
                                                       ? (MediaQuery.of(context)
                                                                       .size
                                                                       .width /
-                                                                  widget
-                                                                      .itemPerRow -
-                                                              8 *
-                                                                  widget
-                                                                      .itemPerRow) /
+                                                                  itemPerRow -
+                                                              8 * itemPerRow) /
                                                           (16 / 9)
-                                                      : (widget.showSmallDescription ??
+                                                      : (showSmallDescription ??
                                                               false)
                                                           ? height / (16 / 9) -
                                                               58
@@ -741,16 +538,14 @@ class _NewsItemState extends State<NewsItem> with TickerProviderStateMixin {
                                         fontWeight: FontWeight.w500,
                                       ),
                                       overflow: TextOverflow.ellipsis,
-                                      maxLines:
-                                          (widget.showSmallDescription ?? false)
-                                              ? 3
-                                              : 5,
+                                      maxLines: (showSmallDescription ?? false)
+                                          ? 3
+                                          : 5,
                                       textAlign: TextAlign.justify,
                                     ),
                                     subtitle: (newsLayout != 'big' &&
                                                 newsLayout != 'condensed') ||
-                                            ((widget.showSmallDescription ??
-                                                    false) &&
+                                            ((showSmallDescription ?? false) &&
                                                 width < 1361)
                                         ? null
                                         : Text(
@@ -878,13 +673,10 @@ class _NewsItemState extends State<NewsItem> with TickerProviderStateMixin {
                                                   ? (MediaQuery.of(context)
                                                                   .size
                                                                   .width /
-                                                              widget
-                                                                  .itemPerRow -
-                                                          8 *
-                                                              widget
-                                                                  .itemPerRow) /
+                                                              itemPerRow -
+                                                          8 * itemPerRow) /
                                                       (16 / 9)
-                                                  : (widget.showSmallDescription ??
+                                                  : (showSmallDescription ??
                                                           false)
                                                       ? height / (16 / 9) - 58
                                                       : width / (16 / 9) - 10,
@@ -1040,15 +832,12 @@ class _NewsItemState extends State<NewsItem> with TickerProviderStateMixin {
                                   ),
                                   overflow: TextOverflow.ellipsis,
                                   maxLines:
-                                      (widget.showSmallDescription ?? false)
-                                          ? 3
-                                          : 5,
+                                      (showSmallDescription ?? false) ? 3 : 5,
                                   textAlign: TextAlign.justify,
                                 ),
                                 subtitle: (newsLayout != 'big' &&
                                             newsLayout != 'condensed') ||
-                                        ((widget.showSmallDescription ??
-                                                false) &&
+                                        ((showSmallDescription ?? false) &&
                                             width < 1361)
                                     ? null
                                     : Text(
@@ -1188,7 +977,7 @@ class _NewsListState extends State<NewsList> {
 
   Future<void> _fetchPage(int offset) async {
     try {
-      List<News> newItems = await F1NewsFetcher().getMoreNews(
+      List<News> newItems = await Formula1().getMoreNews(
         offset,
         tagId: widget.tagId,
         articleType: widget.articleType,
@@ -1234,7 +1023,7 @@ class _NewsListState extends State<NewsList> {
             widget.tagId == null &&
             widget.articleType == null
         ? OfflineNewsList(
-            items: F1NewsFetcher().formatResponse(latestNews),
+            items: Formula1().formatResponse(latestNews),
             scrollController: widget.scrollController,
           )
         : width < 500
@@ -1309,7 +1098,7 @@ class _NewsListState extends State<NewsList> {
   }
 }
 
-class OfflineNewsList extends StatefulWidget {
+class OfflineNewsList extends StatelessWidget {
   final List items;
   final ScrollController? scrollController;
 
@@ -1318,25 +1107,16 @@ class OfflineNewsList extends StatefulWidget {
     this.scrollController,
     Key? key,
   }) : super(key: key);
-  @override
-  State<OfflineNewsList> createState() => _OfflineNewsListState();
-}
-
-class _OfflineNewsListState extends State<OfflineNewsList> {
-  @override
-  void initState() {
-    super.initState();
-  }
 
   @override
   Widget build(BuildContext context) {
     Map cachedNews = Hive.box('requests').get('news', defaultValue: {}) as Map;
     double width = MediaQuery.of(context).size.width;
-    List<News> formatedNews = F1NewsFetcher().formatResponse(cachedNews);
+    List<News> formatedNews = Formula1().formatResponse(cachedNews);
 
     return width < 500
         ? ListView.builder(
-            controller: widget.scrollController,
+            controller: scrollController,
             scrollDirection: Axis.vertical,
             shrinkWrap: true,
             itemCount: formatedNews.length,
@@ -1356,7 +1136,7 @@ class _OfflineNewsListState extends State<OfflineNewsList> {
               crossAxisSpacing: 5.0,
               mainAxisSpacing: 5.0,
             ),
-            controller: widget.scrollController,
+            controller: scrollController,
             scrollDirection: Axis.vertical,
             shrinkWrap: true,
             itemCount: formatedNews.length,
@@ -1373,11 +1153,6 @@ class _OfflineNewsListState extends State<OfflineNewsList> {
                   ),
           );
   }
-
-  @override
-  void dispose() {
-    super.dispose();
-  }
 }
 
 class TextParagraphRenderer extends StatelessWidget {
@@ -1560,7 +1335,7 @@ class TextParagraphRenderer extends StatelessWidget {
   }
 }
 
-class ImageRenderer extends StatefulWidget {
+class ImageRenderer extends StatelessWidget {
   final String imageUrl;
   final String? caption;
   final bool? inSchedule;
@@ -1574,22 +1349,17 @@ class ImageRenderer extends StatefulWidget {
     this.isHero,
   }) : super(key: key);
 
-  @override
-  State<ImageRenderer> createState() => _ImageRendererState();
-}
-
-class _ImageRendererState extends State<ImageRenderer> {
   @override
   Widget build(BuildContext context) {
     bool useDarkMode =
         Hive.box('settings').get('darkMode', defaultValue: true) as bool;
     return Padding(
       padding: EdgeInsets.only(
-        bottom: widget.inSchedule != null ? 0 : 10,
+        bottom: inSchedule != null ? 0 : 10,
       ),
-      child: widget.inSchedule != null
+      child: inSchedule != null
           ? CachedNetworkImage(
-              imageUrl: widget.imageUrl,
+              imageUrl: imageUrl,
               placeholder: (context, url) => SizedBox(
                 height: MediaQuery.of(context).size.width > 1000
                     ? 800
@@ -1645,10 +1415,9 @@ class _ImageRendererState extends State<ImageRenderer> {
                                                 BorderRadius.circular(5),
                                           ),
                                           clipBehavior: Clip.antiAlias,
-                                          child: widget.isHero != null &&
-                                                  widget.isHero!
+                                          child: isHero != null && isHero!
                                               ? CachedNetworkImage(
-                                                  imageUrl: widget.imageUrl,
+                                                  imageUrl: imageUrl,
                                                   placeholder: (context, url) =>
                                                       SizedBox(
                                                     height:
@@ -1669,7 +1438,7 @@ class _ImageRendererState extends State<ImageRenderer> {
                                                       const Duration(
                                                           seconds: 1),
                                                   fadeInDuration:
-                                                      widget.isHero ?? false
+                                                      isHero ?? false
                                                           ? const Duration(
                                                               milliseconds: 300)
                                                           : const Duration(
@@ -1685,7 +1454,7 @@ class _ImageRendererState extends State<ImageRenderer> {
                                                 )
                                               : Image(
                                                   image: NetworkImage(
-                                                    widget.imageUrl,
+                                                    imageUrl,
                                                   ),
                                                   loadingBuilder: (context,
                                                           child,
@@ -1740,9 +1509,9 @@ class _ImageRendererState extends State<ImageRenderer> {
                   child: Stack(
                     alignment: Alignment.bottomCenter,
                     children: [
-                      widget.isHero != null && widget.isHero!
+                      isHero != null && isHero!
                           ? CachedNetworkImage(
-                              imageUrl: widget.imageUrl,
+                              imageUrl: imageUrl,
                               placeholder: (context, url) => SizedBox(
                                 height: MediaQuery.of(context).size.width /
                                     (16 / 9),
@@ -1763,7 +1532,7 @@ class _ImageRendererState extends State<ImageRenderer> {
                               ),
                             )
                           : Image.network(
-                              widget.imageUrl,
+                              imageUrl,
                               loadingBuilder:
                                   (context, child, loadingProgress) =>
                                       loadingProgress == null
@@ -1787,13 +1556,13 @@ class _ImageRendererState extends State<ImageRenderer> {
                             ),
                       Container(
                         alignment: Alignment.bottomCenter,
-                        child: widget.caption != null && widget.caption != ''
+                        child: caption != null && caption != ''
                             ? Container(
                                 width: double.infinity,
                                 padding: const EdgeInsets.all(4),
                                 color: Colors.black.withOpacity(0.7),
                                 child: Text(
-                                  widget.caption!,
+                                  caption!,
                                   style: const TextStyle(
                                     color: Colors.white,
                                   ),
@@ -1843,10 +1612,9 @@ class _ImageRendererState extends State<ImageRenderer> {
                                                   BorderRadius.circular(5),
                                             ),
                                             clipBehavior: Clip.antiAlias,
-                                            child: widget.isHero != null &&
-                                                    widget.isHero!
+                                            child: isHero != null && isHero!
                                                 ? CachedNetworkImage(
-                                                    imageUrl: widget.imageUrl,
+                                                    imageUrl: imageUrl,
                                                     placeholder:
                                                         (context, url) =>
                                                             SizedBox(
@@ -1868,13 +1636,12 @@ class _ImageRendererState extends State<ImageRenderer> {
                                                     fadeOutDuration:
                                                         const Duration(
                                                             seconds: 1),
-                                                    fadeInDuration:
-                                                        widget.isHero ?? false
-                                                            ? const Duration(
-                                                                milliseconds:
-                                                                    300)
-                                                            : const Duration(
-                                                                seconds: 1),
+                                                    fadeInDuration: isHero ??
+                                                            false
+                                                        ? const Duration(
+                                                            milliseconds: 300)
+                                                        : const Duration(
+                                                            seconds: 1),
                                                     cacheManager: CacheManager(
                                                       Config(
                                                         "newsImages",
@@ -1886,7 +1653,7 @@ class _ImageRendererState extends State<ImageRenderer> {
                                                   )
                                                 : Image(
                                                     image: NetworkImage(
-                                                      widget.imageUrl,
+                                                      imageUrl,
                                                     ),
                                                     loadingBuilder: (context,
                                                             child,
@@ -1943,9 +1710,9 @@ class _ImageRendererState extends State<ImageRenderer> {
                     child: Stack(
                       alignment: Alignment.bottomCenter,
                       children: [
-                        widget.isHero != null && widget.isHero!
+                        isHero != null && isHero!
                             ? CachedNetworkImage(
-                                imageUrl: widget.imageUrl,
+                                imageUrl: imageUrl,
                                 placeholder: (context, url) => SizedBox(
                                   height: MediaQuery.of(context).size.width /
                                       (16 / 9),
@@ -1966,7 +1733,7 @@ class _ImageRendererState extends State<ImageRenderer> {
                                 ),
                               )
                             : Image.network(
-                                widget.imageUrl,
+                                imageUrl,
                                 loadingBuilder: (context, child,
                                         loadingProgress) =>
                                     loadingProgress == null
@@ -1990,13 +1757,13 @@ class _ImageRendererState extends State<ImageRenderer> {
                               ),
                         Container(
                           alignment: Alignment.bottomCenter,
-                          child: widget.caption != null && widget.caption != ''
+                          child: caption != null && caption != ''
                               ? Container(
                                   width: double.infinity,
                                   padding: const EdgeInsets.all(4),
                                   color: Colors.black.withOpacity(0.7),
                                   child: Text(
-                                    widget.caption!,
+                                    caption!,
                                     style: const TextStyle(
                                       color: Colors.white,
                                     ),
diff --git a/lib/helpers/news_feed_widget.dart b/lib/helpers/news_feed_widget.dart
index 12154134..c7eed060 100644
--- a/lib/helpers/news_feed_widget.dart
+++ b/lib/helpers/news_feed_widget.dart
@@ -21,31 +21,31 @@
 
 import 'package:boxbox/Screens/MixedNews/rss_feed.dart';
 import 'package:boxbox/Screens/MixedNews/wordpress.dart';
-import 'package:boxbox/api/news.dart';
 import 'package:boxbox/api/rss.dart';
 import 'package:boxbox/helpers/loading_indicator_util.dart';
+import 'package:boxbox/helpers/news.dart';
 import 'package:boxbox/helpers/request_error.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
-class NewsFeedWidget extends StatefulWidget {
+class NewsFeed extends StatefulWidget {
   final String? tagId;
   final String? articleType;
   final ScrollController? scrollController;
-
-  const NewsFeedWidget({
+  const NewsFeed({
     Key? key,
     this.tagId,
     this.articleType,
     this.scrollController,
-  }) : super(key: key);
+  });
+
   @override
-  State<NewsFeedWidget> createState() => _NewsFeedWidgetState();
+  State<NewsFeed> createState() => _NewsFeedState();
 }
 
-class _NewsFeedWidgetState extends State<NewsFeedWidget> {
+class _NewsFeedState extends State<NewsFeed> {
   @override
   void initState() {
     super.initState();
@@ -54,6 +54,62 @@ class _NewsFeedWidgetState extends State<NewsFeedWidget> {
     });
   }
 
+  void showOfflineSnackBar() async {
+    var connectivityResult = await (Connectivity().checkConnectivity());
+    if (connectivityResult == ConnectivityResult.none) {
+      SnackBar offlineSnackBar = SnackBar(
+        content: Row(
+          children: [
+            const Icon(
+              Icons.warning_amber_rounded,
+              color: Colors.black,
+              size: 32,
+            ),
+            Expanded(
+              child: Padding(
+                padding: const EdgeInsets.only(
+                  left: 10,
+                ),
+                child: Text(
+                  AppLocalizations.of(context)!.offline,
+                  style: const TextStyle(
+                    color: Colors.black,
+                    fontSize: 15,
+                  ),
+                  maxLines: 2,
+                ),
+              ),
+            ),
+          ],
+        ),
+        backgroundColor: Colors.yellow,
+      );
+      ScaffoldMessenger.of(context).showSnackBar(offlineSnackBar);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return NewsFeedWidget(
+      tagId: widget.tagId,
+      articleType: widget.articleType,
+      scrollController: widget.scrollController,
+    );
+  }
+}
+
+class NewsFeedWidget extends StatelessWidget {
+  final String? tagId;
+  final String? articleType;
+  final ScrollController? scrollController;
+
+  const NewsFeedWidget({
+    Key? key,
+    this.tagId,
+    this.articleType,
+    this.scrollController,
+  });
+
   @override
   Widget build(BuildContext context) {
     const String officialFeed = "https://api.formula1.com";
@@ -63,9 +119,9 @@ class _NewsFeedWidgetState extends State<NewsFeedWidget> {
         .get('server', defaultValue: officialFeed) as String;
     return savedFeedUrl[1] == "api"
         ? NewsList(
-            scrollController: widget.scrollController,
-            tagId: widget.tagId,
-            articleType: widget.articleType,
+            scrollController: scrollController,
+            tagId: tagId,
+            articleType: articleType,
           )
         : savedFeedUrl[1] == "rss"
             ? FutureBuilder<Map<String, dynamic>>(
@@ -89,41 +145,7 @@ class _NewsFeedWidgetState extends State<NewsFeedWidget> {
               )
             : WordpressNewsList(
                 savedFeedUrl[0],
-                scrollController: widget.scrollController,
+                scrollController: scrollController,
               );
   }
-
-  void showOfflineSnackBar() async {
-    var connectivityResult = await (Connectivity().checkConnectivity());
-    if (connectivityResult == ConnectivityResult.none) {
-      SnackBar offlineSnackBar = SnackBar(
-        content: Row(
-          children: [
-            const Icon(
-              Icons.warning_amber_rounded,
-              color: Colors.black,
-              size: 32,
-            ),
-            Expanded(
-              child: Padding(
-                padding: const EdgeInsets.only(
-                  left: 10,
-                ),
-                child: Text(
-                  AppLocalizations.of(context)!.offline,
-                  style: const TextStyle(
-                    color: Colors.black,
-                    fontSize: 15,
-                  ),
-                  maxLines: 2,
-                ),
-              ),
-            ),
-          ],
-        ),
-        backgroundColor: Colors.yellow,
-      );
-      ScaffoldMessenger.of(context).showSnackBar(offlineSnackBar);
-    }
-  }
 }