diff --git a/app/Providers/GlobalViewDataProvider.php b/app/Providers/GlobalViewDataProvider.php
index 2568d495..58c943fb 100644
--- a/app/Providers/GlobalViewDataProvider.php
+++ b/app/Providers/GlobalViewDataProvider.php
@@ -22,7 +22,6 @@ class GlobalViewDataProvider extends ServiceProvider
         }
 
         view()->share('currentUrl', \Request::url());
-        view()->share('loggedUser', \Auth::user());
 
         $this->extendBlade();
     }
diff --git a/templates/Binarity/Resources/assets/css/app.css b/templates/Binarity/Resources/assets/css/app.css
index 199b6fa4..c1c41c3a 100644
--- a/templates/Binarity/Resources/assets/css/app.css
+++ b/templates/Binarity/Resources/assets/css/app.css
@@ -9286,7 +9286,7 @@ article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,secti
 	line-height: 1em;
 }
 
-.article-list-item .gravatar {
+.gravatar {
 	border-radius: 50%;
 }
 
diff --git a/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php b/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
index adbbb08c..fddf8858 100644
--- a/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
+++ b/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php
@@ -15,7 +15,10 @@
                 <img class="gravatar" src="@gravatar($page->author->email, 50)" alt="">
                 <br />
                 <small>{{$page->author->name}}</small>
+            </div>
 
+            <div class="m-t-25 text-center">
+                <a href="#comments"><i class="fa fa-comments"></i> {{$page->comments->count()}}</a>
             </div>
         </aside>
         <div class="column large-11">
@@ -27,45 +30,73 @@
         </div>
     </div>
     <div class="row m-t-50">
+        <a name="comments"></a>
 
         <h3>Komentáře</h3>
         @foreach($page->comments as $comment)
-            <img src="@gravatar($comment->author->email)" alt=""> {{$comment->author->name}}: {{$comment->content}}
+
+            <div class="row comment">
+                <aside class="column text-center large-1">
+                    <img src="@gravatar($comment->author->email, 30)" class="gravatar" alt="">
+                    <br />
+                    <small>
+                        @date($comment->created_at, false)
+                    </small>
+                </aside>
+                <div class="column large-11">
+                    <header>
+                        <a name="{{$comment->id}}"></a>
+                        <h6><a href="#{{$comment->id}}">{{$comment->author->name}}</a></h6>
+                    </header>
+                    <article>
+                        {{$comment->content}}
+                    </article>
+                </div>
+                <div class="clearfix"></div>
+            </div>
         @endforeach
 
-        @if(session('success'))
-            <div class="callout succes">
-                Komentář úspěšně uložen.
+        <?php
+        $loggedUser = \Auth::user();
+        ?>
+        <div class="row m-t-25 ">
+            <div class="column large-1">
+                @if($loggedUser)
+                    <img src="@gravatar($loggedUser->email)" class="gravatar" alt="">
+                @endif
             </div>
-        @endif
-
-        <form method="post" action="{{route('comments.new', ['id' => $page->id])}}">
-            {!! csrf_field() !!}
-
-            @if($loggedUser)
-                <img src="@gravatar($loggedUser->email)" alt=""> {{$loggedUser->name}}
-            @else
-                <div class="row">
-                    <div class="column medium-6">
-                        <input type="text" name="name" required placeholder="Jméno">
+            <div class="column large-11">
+                @if(session('success'))
+                    <div class="callout succes">
+                        Komentář úspěšně uložen. @if (!$loggedUser) Po schválení se zde objeví. @endif
                     </div>
-                    <div class="column medium-6">
-                        <input type="email" name="email" required placeholder="E-mail">
+                @endif
+
+                <form method="post" action="{{route('comments.new', ['id' => $page->id])}}">
+                    {!! csrf_field() !!}
+
+                    @if(!$loggedUser)
+                        <div class="row">
+                            <div class="column medium-6">
+                                <input type="text" name="name" required placeholder="Jméno">
+                            </div>
+                            <div class="column medium-6">
+                                <input type="email" name="email" required placeholder="E-mail">
+                            </div>
+                        </div>
+                    @endif
+
+                    <div class="row">
+                        <div class="column medium-12">
+                            <textarea name="message" required>{{old('message')}}</textarea>
+
+                            <button type="submit" class="button success">Uložit</button>
+                        </div>
                     </div>
-                </div>
-            @endif
-
-            <div class="row">
-                <div class="column medium-12">
-                    <textarea name="message" required>{{old('message')}}</textarea>
-
-                    <button type="submit" class="button success">Uložit</button>
-
-                </div>
+                </form>
             </div>
-        </form>
+        </div>
+
 
     </div>
-
-
 @endsection
\ No newline at end of file