diff --git a/app/Http/Controllers/tmp/test.png b/app/Http/Controllers/tmp/test.png
index 0057edc..d6a5443 100644
Binary files a/app/Http/Controllers/tmp/test.png and b/app/Http/Controllers/tmp/test.png differ
diff --git a/public/css/w0bmcustom.css b/public/css/w0bmcustom.css
index abcdf4e..11f261f 100644
--- a/public/css/w0bmcustom.css
+++ b/public/css/w0bmcustom.css
@@ -250,6 +250,7 @@ div.tbody {
     -webkit-transition: height 0.8s;
     -moz-transition: height 0.8s;
     transition: height 0.8s;
+    border: 1px solid black;
 }
 #commentForm textarea:active, #commentForm textarea:focus, #commentForm textarea:valid {
     height: 8em;
@@ -2679,8 +2680,9 @@ ul.downloadlist {
 nsfw {
     color: #d83b3bcc;
     background: #0a090c;
-    border-radius: 5px;
-    padding: 2px;
+    padding: 5px;
+    position: absolute;
+    font-weight: bold;
 }
 
 nsfw::after {
@@ -2690,8 +2692,9 @@ nsfw::after {
 sfw {
     color: #59d83bcc;
     background: #0a090c;
-    border-radius: 5px;
-    padding: 2px;
+    padding: 5px;
+    position: absolute;
+    font-weight: bold;
 }
 
 sfw::after {
@@ -3797,15 +3800,18 @@ button#layout4:before {
 }
 
 .commbordersoos {
-    border: 1px solid black;
-    background: #1313137a;
+    background: #3a3938;
     margin-left: 5px;
     margin-right: 5px;
-    margin-bottom: 5px;
+    /*margin-bottom: 5px;*/
+    margin-top: -5px;
+    border-left: 1px solid black;
+    border-right: 1px solid black;
+    border-bottom: 1px solid black;
 }
 
 #parent {
-    background: #1a1a1b;
+    background: #3a3938;
     border-radius: 0;
     padding: 5px;
     cursor: pointer;
@@ -3816,3 +3822,16 @@ button#layout4:before {
     border-bottom: 1px solid black;
     border-right: 1px solid black;
 }
+
+.not-logged-in {
+    padding: 10px;
+    background: #1a1a1b;
+    margin: 5px;
+    border-radius: 5px;
+    display: flex;
+    justify-content: center;
+}
+
+.sees.panel.panel-default {
+    padding-bottom: 5px;
+}
\ No newline at end of file
diff --git a/resources/views/layout1/video.blade.php b/resources/views/layout1/video.blade.php
index c35d009..fa3a972 100644
--- a/resources/views/layout1/video.blade.php
+++ b/resources/views/layout1/video.blade.php
@@ -137,33 +137,24 @@
 
 @else
 {{$video->tesThumb()}}
-{{--<a href="#" data-toggle="modal" data-target="#loginmodal"><i class="fa fa-sign-in"></i> Login</a>
-@include('partials.loginmodal') --}}
-<div class="centershock" style="text-align: center;">
-<p class="forbidden">403 - Forbidden</p>
-<div class="wrap-collabsible">
-  <input id="collapsible" class="toggle" type="checkbox">
-  <label for="collapsible" class="lbl-toggle">Login</label>
-  <div class="collapsible-content">
-    <div class="content-inner">
-        <div class="centered">
-  <form action="{{action('UserController@login')}}" method="post" class="form-signin">
-        {!! csrf_field() !!}
-        <input type="text" name="identifier" placeholder="Username" class="form-control">
-        <input type="password" name="password" placeholder="Password" class="form-control">
-        <input type="checkbox" name="remember" checked> Remember me<br>
-        <button type="submit" class="btn btn-primary">Login</button>
-        <a href="{{url('register')}}" class="btn btn-success disabled">Register</a>
-  </form>
-</div>
-    <p>w0bm now supports a javascript free experience, check it out if you dont like js that much</p>
-    </div>
-  </div>
-</div>
-</div>
-<div class="media">
-  <div class="media-left media-middle">
-      <img class="media-object" src="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif">
+<div class="centered">
+        <div class="modal-content col-md-5">
+            <div class="modal-header">
+                <h4 class="modal-title" id="filterModalTitle">Login</h4> <span>to watch this webbum</span>
+            </div>
+            
+            <div class="login_wrapper">
+            	<div class="col-md">
+					<form action="{{action('UserController@login')}}" method="post" class="navbar-form">
+						{!! csrf_field() !!}
+                	     <input type="text" name="identifier" placeholder="Username" class="form-control usernamelogin"><br>
+                	     <input type="password" name="password" placeholder="Password" class="form-control passwordlogin"><br>
+                	     <button type="submit" class="btn btn-primary">Login</button> <input id="rememberme" checked type="checkbox" name="remember"> <span id="rember">Remember me?</span>
+					</form>
+				</div>
+	   		</div>
+	   		<div class="media not-logged-in">
+  <div class="media-left">
     <div class="rating">
           @if(count($video->tags))
         @foreach($video->tags as $tag)
@@ -174,12 +165,27 @@
           @endif
         @endforeach
       @endif
+      <img class="media-object" src="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif">
   </div>
   </div>
   <div class="media-body">
     <h4 class="media-heading">@if($video->videotitle){{$video->videotitle}}@else<p><i>No Title</i></p></h4>
     ...@endif
+            <div id="tag-display" style="width: auto;" class="tag-panel-body">
+            @if(count($video->tags))
+                @foreach($video->tags as $tag)
+                    <span class="label label-default"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag default-link" href="#"><i class="fa fa-times"></i></a>@endif</span>
+                @endforeach
+            @else
+                No tags yet ...
+            @endif
+        </div>
   </div>
 </div>
+        		<div class="modal-footer">
+			<p>Enjoy your stay! :3</p>
+        	</div>
+        </div>
+    </div>
 @endif
 @endsection