diff --git a/.gitignore b/.gitignore
index 42d6013f7..f7158d101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Please try and keep this file organized by alphabetical order. Single files first, then directories.
 .env
 .phpunit.result.cache
+.DS_Store
 Homestead.yaml
 Homestead.json
 /config/lfm.php
diff --git a/app/FaveoStorage/Controllers/SettingsController.php b/app/FaveoStorage/Controllers/SettingsController.php
index 1c3d8138e..077ef4302 100644
--- a/app/FaveoStorage/Controllers/SettingsController.php
+++ b/app/FaveoStorage/Controllers/SettingsController.php
@@ -92,7 +92,7 @@ class SettingsController extends Controller
     public function directories($root = '')
     {
         if ($root == '') {
-            $root = base_path();
+            $root = storage_path();
         }
 
         $iter = new RecursiveIteratorIterator(
diff --git a/app/Http/Middleware/CheckRoleAgent.php b/app/Http/Middleware/CheckRoleAgent.php
index e2e73012a..577173cd1 100644
--- a/app/Http/Middleware/CheckRoleAgent.php
+++ b/app/Http/Middleware/CheckRoleAgent.php
@@ -25,6 +25,6 @@ class CheckRoleAgent
             return $next($request);
         }
 
-        return redirect('dashboard')->with('fails', 'You are not Autherised');
+        return redirect('/')->with('fails', 'You are not Autherised');
     }
 }
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php
index bb5092c6a..3ac99b1a1 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php
@@ -270,6 +270,8 @@ class="active"
     </div>
 </div><!-- /. box -->
 {!! Form::close() !!}
+@stop
+@push('scripts')
 <script type="text/javascript">
     $(document).ready(function () {
         var helpTopic = $("#selectid").val();
@@ -357,9 +359,7 @@ class="active"
         });
     });
 </script>
-
-@stop
-
+@endpush
 
 
 
diff --git a/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php b/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
index 5875d4c7d..49f34363e 100755
--- a/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
+++ b/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
@@ -24,7 +24,7 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
 
     .mailbox-attachment-icon,.mailbox-attachment-info,.mailbox-attachment-size{display:block}
 
-    .mailbox-attachment-info{padding:10px;background:#f4f4f4;height: 80px;}
+    .mailbox-attachment-info{padding:10px;background:#f4f4f4;height: auto;}
 
     .mailbox-attachment-size{color:#999;font-size:12px}
 
@@ -420,7 +420,7 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
                                                 echo '<li><span class="mailbox-attachment-icon has-img">' . $var . '</span><div class="mailbox-attachment-info"><a class="mailbox-attachment-name">' . $attachment->name . '</a><span class="mailbox-attachment-size">' . $value . '</span></div></li>';
                                             } else {
                                                 //$var = '<a href="' . URL::route('image', array('image_id' => $attachment->id)) . '" target="_blank"><img style="max-width:200px;height:133px;" src="data:'.$attachment->type.';base64,' . base64_encode($data) . '"/></a>';
-                                                $var = '<a style="width:200px;height:120px;" href="' . URL::route('image', array('image_id' => $attachment->id)) . '" target="_blank"></a><span class="mailbox-attachment-icon" style="background:#fff;height:120px;font-size:16px;">' . strtoupper($attachment->type) . '</span><div class="mailbox-attachment-info"><a class="mailbox-attachment-name">' . $attachment->name . '</a><span class="mailbox-attachment-size">' . $value . '</span></div>';
+                                                $var = '<a style="width:200px;height:120px;text-decoration: none;" href="' . URL::route('image', array('image_id' => $attachment->id)) . '" target="_blank"><span class="mailbox-attachment-icon" style="background:#fff;height:120px;font-size:16px;">' . strtoupper($attachment->type) . '</span></a><div class="mailbox-attachment-info">' . $attachment->name . '<span class="mailbox-attachment-size">' . $value . '</span></div>';
 
                                                 echo '<li style="background-color:#f4f4f4;">' . $var . '</li>';
                                             }
diff --git a/resources/views/themes/default1/client/helpdesk/form.blade.php b/resources/views/themes/default1/client/helpdesk/form.blade.php
index a8cfd52ab..131f0db58 100755
--- a/resources/views/themes/default1/client/helpdesk/form.blade.php
+++ b/resources/views/themes/default1/client/helpdesk/form.blade.php
@@ -208,7 +208,6 @@ class = "nav-item active"
                             {!! Form::textarea('Details',null,['class' => 'form-control']) !!}
                         </div>
                         <div class="col-md-12 form-group">
-                            <label>{!! Lang::get('lang.attachment') !!}</label>
                             <input type="file" name="attachment[]" multiple/><br/>
                             {!! Lang::get('lang.max') !!}. {!! $max_size_in_actual !!}
                         </div>
diff --git a/resources/views/themes/default1/client/layout/client.blade.php b/resources/views/themes/default1/client/layout/client.blade.php
index dd7546a8a..f57f82472 100644
--- a/resources/views/themes/default1/client/layout/client.blade.php
+++ b/resources/views/themes/default1/client/layout/client.blade.php
@@ -241,8 +241,14 @@
                                         </ul>
                                     </li>
                                 </ul>
-
-                            <div id="login-form" class="login-form collapse fade clearfix" @if(isset($errors))<?php if ($errors->first('email') || $errors->first('password')) { ?> class="login-form collapse fade clearfix in" <?php } else { ?> class="login-form collapse fade clearfix" <?php } ?>@endif >
+                                <?php 
+                                    $loginFormClass = "login-form collapse fade clearfix";
+                                    if(isset($errors) && ($errors->first('email') || $errors->first('password')))
+                                    {
+                                        $loginFormClass .= " show";
+                                    }
+                                ?>
+                            <div id="login-form" class="{{$loginFormClass}}">
                                  <div class="row">
                                     <div class="col-md-12">
                                         {!!  Form::open(['action'=>'Auth\AuthController@postLogin', 'method'=>'post']) !!}