diff --git a/public/css/base.css b/public/css/base.css
new file mode 100644
index 0000000..a6ad0b2
--- /dev/null
+++ b/public/css/base.css
@@ -0,0 +1,7 @@
+.bg-grey {
+    background-color: #ccc;
+}
+
+.navbar {
+    margin-bottom: 50px;
+}
\ No newline at end of file
diff --git a/public/css/dashboard.css b/public/css/dashboard.css
new file mode 100644
index 0000000..411afa0
--- /dev/null
+++ b/public/css/dashboard.css
@@ -0,0 +1,23 @@
+.grid-container {
+    width: 106%;
+    margin-left: -3%;
+}
+
+.grid-container .row {
+    margin: 0;
+}
+
+.video-tile {
+    padding: 3%;
+}
+
+.video-tile:after {
+    content: "";
+    display: block;
+    padding-top: 100%;
+}
+
+.tile-content {
+    width: 100%;
+    height: 100%;
+}
\ No newline at end of file
diff --git a/public/css/video-js-fantasy.css b/public/css/video-js-fantasy.css
new file mode 100644
index 0000000..b282ce5
--- /dev/null
+++ b/public/css/video-js-fantasy.css
@@ -0,0 +1 @@
+.vjs-theme-fantasy{--vjs-theme-fantasy--primary:#9f44b4;--vjs-theme-fantasy--secondary:#fff}.vjs-theme-fantasy .vjs-big-play-button{width:70px;height:70px;background:none;line-height:70px;font-size:80px;border:none;top:50%;left:50%;margin-top:-35px;margin-left:-35px;color:var(--vjs-theme-fantasy--primary)}.vjs-theme-fantasy.vjs-big-play-button:focus,.vjs-theme-fantasy:hover .vjs-big-play-button{background-color:transparent;color:#fff}.vjs-theme-fantasy .vjs-control-bar{height:54px}.vjs-theme-fantasy .vjs-button>.vjs-icon-placeholder:before,.vjs-theme-fantasy .vjs-time-control{line-height:54px}.vjs-theme-fantasy .vjs-play-control{font-size:1.5em;position:relative}.vjs-theme-fantasy .vjs-volume-panel{order:4}.vjs-theme-fantasy .vjs-volume-bar{margin-top:2.5em}.vjs-theme-city .vjs-volume-panel:hover .vjs-volume-control.vjs-volume-horizontal{height:100%}.vjs-theme-fantasy .vjs-progress-control .vjs-progress-holder,.vjs-theme-fantasy .vjs-progress-control:hover .vjs-progress-holder{font-size:1.5em}.vjs-theme-fantasy .vjs-play-control .vjs-icon-placeholder:before{height:1.3em;width:1.3em;margin-top:.2em;border-radius:1em;border:3px solid var(--vjs-theme-fantasy--secondary);top:2px;left:9px;line-height:1.1}.vjs-theme-fantasy .vjs-play-control:hover .vjs-icon-placeholder:before{border:3px solid var(--vjs-theme-fantasy--secondary)}.vjs-theme-fantasy .vjs-play-progress,.vjs-theme-fantasy .vjs-play-progress:before{background-color:var(--vjs-theme-fantasy--primary)}.vjs-theme-fantasy .vjs-play-progress:before{height:.8em;width:.8em;content:"";border:4px solid var(--vjs-theme-fantasy--secondary);border-radius:.8em;top:-.25em}.vjs-theme-fantasy .vjs-progress-control{font-size:14px}.vjs-theme-fantasy .vjs-fullscreen-control{order:6}.vjs-theme-fantasy .vjs-remaining-time{display:none}.vjs-theme-fantasy.nyan .vjs-play-progress{background:linear-gradient(180deg,#fe0000 0,#fe9a01 16.666666667%,#fe9a01 0,#ff0 33.332666667%,#ff0 0,#32ff00 49.999326667%,#32ff00 0,#0099fe 66.6659926%,#0099fe 0,#63f 83.33266%,#63f 0)}.vjs-theme-fantasy.nyan .vjs-play-progress:before{height:1.3em;width:1.3em;background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 125' fill='%23fff'%3E%3Cpath d='M62.153 37.323h2.813v3.246h-2.813zM64.858 40.569h2.813v3.246h-2.813zM67.672 43.814h11.9v3.246h-11.9zM79.572 24.449h2.813v19.365h-2.813zM82.386 37.323h3.244v3.246h-3.244zM85.63 34.132h5.627v3.246H85.63zM91.257 37.323h2.92v12.95h-2.92zM94.177 50.274h2.922V66.21h-2.922zM91.29 66.372h2.887v3.245H91.29zM88.401 69.617h2.889v3.246h-2.889zM27.312 72.863h61.003v3.245H27.312zM73.622 76.108h2.889v3.246h-2.889zM82.563 76.108h2.888v3.246h-2.888zM76.511 79.354h6.053v3.245h-6.053zM61.941 79.354h8.895v3.245h-8.895zM67.947 76.108h2.889v3.246h-2.889zM59.321 76.108h2.888v3.246h-2.888zM27.312 17.917h49.387v3.246H27.312zM76.699 21.162h2.873v3.287h-2.873zM56.372 34.132h5.781v3.191h-5.781zM53.448 37.323h2.924v12.951h-2.924zM50.488 50.274h2.96v16.049h-2.96zM53.448 66.323h2.924v3.257h-2.924zM56.372 69.58h2.949v3.283h-2.949zM65.069 63.213h2.878v6.367h-2.878zM67.947 66.397h17.504v3.22H67.947z'/%3E%3Cpath d='M82.563 63.213h2.888v3.185h-2.888zM73.801 63.213h2.898v3.185h-2.898zM76.699 56.774h2.873v3.145h-2.873zM82.563 56.774h2.888v3.145h-2.888zM85.451 53.444h2.864v3.33h-2.864z'/%3E%3Cpath d='M85.451 56.774h2.864v3.145h-2.864zM65.069 53.444h2.878v3.33h-2.878zM65.069 56.774h2.878v3.145h-2.878zM62.209 56.774h2.86v3.145h-2.86zM21.509 24.327h2.813v45.169h-2.813zM24.323 21.162h2.99v3.165h-2.99zM18.562 69.496h8.75v3.367h-8.75zM15.656 72.863h2.906v9.591h-2.906zM18.562 79.301h8.75v3.153h-8.75zM24.323 76.108h5.743V79.3h-5.743zM33.136 76.108h2.824v6.346h-2.824zM35.96 79.281h5.813v3.173H35.96zM41.774 76.108h2.864v3.173h-2.864zM3.948 40.569h11.708v3.229H3.948zM3.948 43.814h2.921v6.459H3.948zM6.869 47.06h2.934v6.384H6.869zM9.803 50.274h2.909v6.5H9.803z'/%3E%3Cpath d='M12.711 53.444h2.945v6.475h-2.945zM15.656 56.774h5.853v3.145h-5.853z'/%3E%3Cpath d='M18.583 59.919h2.926v3.294h-2.926zM18.583 47.044h2.926v6.4h-2.926zM12.711 43.814h5.872v3.229h-5.872zM15.647 47.044h2.936v3.2h-2.936z'/%3E%3Cpath fill='none' d='M47.439 50.274h3.049v3.17h-3.049z'/%3E%3Cpath d='M73.801 30.94v-3.138h-2.965v-3.354l-37.7-.122v3.151h-3.07v3.462l-2.753-.108-.118 32.381h2.871v3.185h3.07v-3.185h2.824v3.185h-2.824v3.099l20.312.084v-3.257h-2.96V50.274h2.96V37.323h2.924v-3.191h5.781v3.191h2.813l-.108 3.246h2.813v3.246h9.027V30.94h-2.897zM33.136 56.682h-3.07v-3.158h3.07v3.158zm2.824-22.55h-2.824v-3.084h2.824v3.084zm2.907 12.928h2.907v3.184h-2.907V47.06zm5.771 16.153h-2.864v-3.294h2.864v3.294zm2.801-19.399h-2.801v-3.246h2.801v3.246zm6.009-12.766h-2.96v-3.354h2.96v3.354zm8.705 0h-2.832v-3.354h2.832v3.354zm8.683 6.275h-2.889v-3.191h2.889v3.191z'/%3E%3C/svg%3E") no-repeat;border:none;top:-.35em}
\ No newline at end of file
diff --git a/public/css/watch.css b/public/css/watch.css
new file mode 100644
index 0000000..d6e3f57
--- /dev/null
+++ b/public/css/watch.css
@@ -0,0 +1,26 @@
+#player {
+    width: 73.5%;
+}
+
+#player .video-js {
+    width: 100%;
+}
+
+.pane-container {
+    position: relative;
+}
+
+#set {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    width: 23.5%;
+    min-height: 100px;
+    padding: 1%;
+}
+
+#description {
+    margin-top: 3%;
+    width: 73.5%;
+    padding: 1%;
+}
\ No newline at end of file
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index c8e66e9..d972b3d 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -29,7 +29,7 @@ class HomeController extends AbstractController
     }
 
     /**
-     * @Route("/", name="app_home")
+     * @Route("/", name="app_dashboard")
      */
     public function home(): Response
     {
diff --git a/src/Controller/WatchController.php b/src/Controller/WatchController.php
index ef90efe..7d9416b 100644
--- a/src/Controller/WatchController.php
+++ b/src/Controller/WatchController.php
@@ -146,7 +146,8 @@ class WatchController extends AbstractController
             "global" => $this->generateUrl("app_watch_global", [
                 "linkId" => $linkId,
                 "videoId" => $videoId
-            ])
+            ]),
+            "video" => $data["video"],
         ]);
     }
 }
\ No newline at end of file
diff --git a/src/Security/LoginFormAuthenticator.php b/src/Security/LoginFormAuthenticator.php
index 3ae64a0..f88d377 100644
--- a/src/Security/LoginFormAuthenticator.php
+++ b/src/Security/LoginFormAuthenticator.php
@@ -95,7 +95,7 @@ class LoginFormAuthenticator extends AbstractFormLoginAuthenticator
             return new RedirectResponse($targetPath);
         }
 
-        return new RedirectResponse($this->urlGenerator->generate('app_home'));
+        return new RedirectResponse($this->urlGenerator->generate('app_dashboard'));
     }
 
     protected function getLoginUrl()
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 62d546e..71bba6e 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -3,14 +3,63 @@
 <head>
     <meta charset="UTF-8">
     <title>{% block title %}Welcome!{% endblock %}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css"/>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons">
     <link rel="stylesheet" href="{{ asset("css/mdb.min.css") }}">
     <link rel="stylesheet" href="{{ asset("css/mdb.rtl.min.css") }}">
+    <link rel="stylesheet" href="{{ asset("css/base.css") }}">
     {% block stylesheets %}{% endblock %}
 </head>
-<body>
+<body class="bg-grey">
+{% set route_name = app.request.attributes.get('_route') %}
 <div class="container">
+    <nav class="navbar navbar-expand-lg navbar-light bg-light shadow-5-strong">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="#">MyTube</a>
+
+            <button
+                    class="navbar-toggler"
+                    type="button"
+                    data-mdb-toggle="collapse"
+                    data-mdb-target="#navbarSupportedContent"
+                    aria-controls="navbarSupportedContent"
+                    aria-expanded="false"
+                    aria-label="Toggle navigation"
+            >
+                <i class="fas fa-bars"></i>
+            </button>
+
+            <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                    <li class="nav-item">
+                        <a class="nav-link {% if route_name == "app_dashboard" %} active {% endif %}"
+                           aria-current="page" href="{{ path("app_dashboard") }}">Dashboard</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link {% if route_name == "app_upload" %} active {% endif %}" aria-current="page"
+                           href="{{ path("app_upload") }}">Upload</a>
+                    </li>
+                </ul>
+                <form class="d-flex input-group w-auto">
+                    <input
+                            type="search"
+                            class="form-control"
+                            placeholder="Type query"
+                            aria-label="Search"
+                    />
+                    <button
+                            class="btn btn-outline-primary"
+                            type="button"
+                            data-mdb-ripple-color="dark"
+                    >
+                        Search
+                    </button>
+                </form>
+            </div>
+        </div>
+    </nav>
+
     {% block body %}{% endblock %}
 </div>
 <script src="{{ asset("js/mdb.min.js") }}"></script>
diff --git a/templates/home/dashboard.html.twig b/templates/home/dashboard.html.twig
index 2c5b166..aacf6a4 100644
--- a/templates/home/dashboard.html.twig
+++ b/templates/home/dashboard.html.twig
@@ -1,14 +1,21 @@
 {% extends 'base.html.twig' %}
 
 {% block title %}Home{% endblock %}
+{% block stylesheets %}
+    <link rel="stylesheet" href="{{ asset("css/dashboard.css") }}">
+{% endblock %}
 
 {% block body %}
-
-    {% for video in videos %}
-        <div>
-            {{ video.name }}
-            (<a href="{{ path("app_watch_page", {linkId: constant("App\\Controller\\WatchController::OWNER_LINK_ID"), videoId: video.customId}) }}">Link</a>)
+    <div class="grid-container">
+        <div class="row">
+            {% for video in videos %}
+                <div class="video-tile col-md-4">
+                    <div class="tile-content bg-light shadow-5-strong">
+                        {{ video.name }}
+                        (<a href="{{ path("app_watch_page", {linkId: constant("App\\Controller\\WatchController::OWNER_LINK_ID"), videoId: video.customId}) }}">Link</a>)
+                    </div>
+                </div>
+            {% endfor %}
         </div>
-    {% endfor %}
-
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/watch/watch.html.twig b/templates/watch/watch.html.twig
index 349ef0d..e267fd2 100644
--- a/templates/watch/watch.html.twig
+++ b/templates/watch/watch.html.twig
@@ -4,6 +4,10 @@
 
 {% block stylesheets %}
     <link rel="stylesheet" href="{{ asset("css/video-js.css") }}">
+
+    <link href="{{ assert("css/video-js-fantasy.css") }}" rel="stylesheet">
+
+    <link rel="stylesheet" href="{{ asset("css/watch.css") }}"
 {% endblock %}
 
 {% block javascripts %}
@@ -11,22 +15,32 @@
 {% endblock %}
 
 {% block body %}
-    <video
-            id="my-video"
-            class="video-js"
-            controls
-            preload="auto"
-            width="640"
-            height="264"
-            poster="{{ thumbnail }}"
-            data-setup="{}"
-    >
-        <!--<source src="{{ global }}#.m3u8" type="application/vnd.apple.mpegur" />-->
-        <source src="{{ global }}#.m3u8" type="application/x-mpegURL"/>
-        <p class="vjs-no-js">
-            To view this video please enable JavaScript, and consider upgrading to a
-            web browser that
-            <a href="https://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a>
-        </p>
-    </video>
+    <div class="pane-container">
+        <div id="player" class="shadow-5-strong">
+            <video
+                    class="video-js vjs-theme-fantasy"
+                    controls
+                    preload="auto"
+                    poster="{{ thumbnail }}"
+                    data-setup="{}"
+            >
+                <!--<source src="{{ global }}#.m3u8" type="application/vnd.apple.mpegur" />-->
+                <source src="{{ global }}#.m3u8" type="application/x-mpegURL"/>
+                <p class="vjs-no-js">
+                    To view this video please enable JavaScript, and consider upgrading to a
+                    web browser that
+                    <a href="https://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a>
+                </p>
+            </video>
+        </div>
+        <div id="description" class="bg-light shadow-5-strong">
+            <h2>{{ video.name }}</h2>
+            <p>
+                {{ video.description }}
+            </p>
+        </div>
+        <div id="set" class="bg-light shadow-5-strong">
+            <h2>Set</h2>
+        </div>
+    </div>
 {% endblock %}
\ No newline at end of file