diff --git a/project/lib/ui/page/EpisodePage.dart b/project/lib/ui/page/EpisodePage.dart
index e9fa680..1096f03 100644
--- a/project/lib/ui/page/EpisodePage.dart
+++ b/project/lib/ui/page/EpisodePage.dart
@@ -13,6 +13,7 @@ import 'package:animego/ui/page/AnimeDetailPage.dart';
 import 'package:animego/ui/page/CategoryPage.dart';
 import 'package:animego/ui/page/VideoPlayerPage.dart';
 import 'package:animego/ui/page/WatchAnimePage.dart';
+import 'package:animego/ui/page/tablet/TabletAnimePage.dart';
 import 'package:animego/ui/widget/LoadingSwitcher.dart';
 import 'package:animego/ui/widget/SearchAnimeButton.dart';
 import 'package:android_intent/android_intent.dart';
@@ -179,7 +180,11 @@ class _EpisodePageState extends State<EpisodePage>
                           context,
                           Util.platformPageRoute(
                             // this is only visible on mobile so no need to go to tablet page
-                            builder: (context) => AnimeDetailPage(info: info),
+                            builder: (context) {
+                              if (Util(context).isTablet())
+                                return TabletAnimePage(info: info);
+                              return AnimeDetailPage(info: info);
+                            },
                           ),
                         );
                       },
@@ -350,6 +355,7 @@ class _EpisodePageState extends State<EpisodePage>
                   return VideoPlayerPage(
                     videoLink: e.link,
                     refererLink: e.referrer,
+                    title: info?.episodeName,
                   );
                 }),
               );
diff --git a/project/lib/ui/page/VideoPlayerPage.dart b/project/lib/ui/page/VideoPlayerPage.dart
index a5d7829..1756989 100644
--- a/project/lib/ui/page/VideoPlayerPage.dart
+++ b/project/lib/ui/page/VideoPlayerPage.dart
@@ -8,12 +8,14 @@ import 'package:video_player/video_player.dart';
 class VideoPlayerPage extends StatefulWidget {
   const VideoPlayerPage({
     Key? key,
-    this.refererLink,
     required this.videoLink,
+    this.refererLink,
+    this.title,
   }) : super(key: key);
 
   final String? refererLink;
   final String? videoLink;
+  final String? title;
 
   @override
   _VideoPlayerPageState createState() => _VideoPlayerPageState();
@@ -60,10 +62,10 @@ class _VideoPlayerPageState extends State<VideoPlayerPage>
     return Scaffold(
       appBar: Util.isIOS()
           ? AppBar(
-              title: Text('Video Player'),
+              title: Text(widget.title ?? 'Video Player'),
             )
           : null,
-      body: Container(
+      body: SafeArea(
         child: FlickVideoPlayer(
           flickManager: flickManager,
           // force landscape