Index: app/Http/Controllers/Dashboard/DepartmentsController.php
===================================================================
--- app/Http/Controllers/Dashboard/DepartmentsController.php	(revision 3536fe9594879dd59ec9a336fee42bc4967032cf)
+++ app/Http/Controllers/Dashboard/DepartmentsController.php	(revision 28bab7bb8c2c05c2069ce1d6d52d6ae6d0dfc009)
@@ -163,5 +163,5 @@
 
             else {
-            Alert::flash("All departments are empty", "warning");
+            Alert::flash("All folders are empty", "warning");
             return redirect()->back();
             }
Index: app/Http/Controllers/Dashboard/FoldersController.php
===================================================================
--- app/Http/Controllers/Dashboard/FoldersController.php	(revision 3536fe9594879dd59ec9a336fee42bc4967032cf)
+++ app/Http/Controllers/Dashboard/FoldersController.php	(revision 28bab7bb8c2c05c2069ce1d6d52d6ae6d0dfc009)
@@ -119,6 +119,6 @@
         $existingFolder = Folder::where(['department_id' => $request->department, 'name' => $request->name, 'arch_id' => $request->arch_id])->count();
 
-        $existingFolderName = Folder::where(['department_id' => $request->department, 'name' => $request->name])->count();
-        $existingFolderArchId = Folder::where(['department_id' => $request->department, 'arch_id' => $request->arch_id])->count();
+        $existingFolderName = Folder::where(['department_id' => $request->department, 'name' => $request->name])->get();
+        $existingFolderArchId = Folder::where(['department_id' => $request->department, 'arch_id' => $request->arch_id])->get();
 
         if($existingFolder > 0) {
@@ -126,5 +126,7 @@
         }
 
-        if(($existingFolderName > 0 && $existingFolderArchId <= 0) || ($existingFolderName <= 0 && $existingFolderArchId > 0)) {
+        //dd($existingFolderName, $existingFolderArchId);
+
+        if(($existingFolderName->isNotEmpty() && $existingFolderArchId->isEmpty()) || ($existingFolderName->isEmpty() && $existingFolderArchId->isNotEmpty())) {
             Alert::flash("Can't create another version since folder name or archive ID is different", "error");
 
Index: resources/views/dashboard/folders/index.blade.php
===================================================================
--- resources/views/dashboard/folders/index.blade.php	(revision 3536fe9594879dd59ec9a336fee42bc4967032cf)
+++ resources/views/dashboard/folders/index.blade.php	(revision 28bab7bb8c2c05c2069ce1d6d52d6ae6d0dfc009)
@@ -152,4 +152,7 @@
                                             <a href="{{ route("dashboard.folders.downloadFolder", ['id' => $folder->id]) }}" class="dropdown-item">Download</a>
                                             @endif
+                                            @if(auth()->user()->hasPermission('manage_all_folders'))
+                                                <a href="javascript:void(0)" data-toggle="modal" data-target="#createVersionModal_{{$folder->id}}" class="dropdown-item">Create version</a>
+                                            @endif
                                             @if(auth()->user()->hasPermission('delete_data'))
                                             <a href="javascript:void(0)" class="dropdown-item" data-toggle="modal" data-target="#deleteModal_{{$folder->id}}">Delete</a>
@@ -205,5 +208,5 @@
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h5 class="modal-title" id="exampleModalCenterTitle">Upload</h5>
+                                    <h5 class="modal-title" id="exampleModalCenterTitle">Upload files to {{$folder->name}}</h5>
                                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                                         <i class="ti-close"></i>
@@ -242,4 +245,65 @@
                         </div>
                     </div>
+
+                    <div class="modal fade" id="createVersionModal_{{$folder->id}}" tabindex="-1" role="dialog" aria-hidden="true">
+                        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <h5 class="modal-title" id="exampleModalCenterTitle">Create folder</h5>
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                        <i class="ti-close"></i>
+                                    </button>
+                                </div>
+                                <div class="modal-body">
+                                    <form action="{{ route("dashboard.folders.store") }}" method="post" accept-charset="utf-8" enctype="multipart/form-data">
+                                        @csrf
+                                        <div class="row">
+                                            <div class="col-md-6">
+                                                <div class="form-group">
+                                                    <label for="exampleFormControlSelect1">Department</label>
+                                                        <select class="form-control" name="department" required>
+                                                                <option value="{{ $folder->department->id }}">{{ $folder->department->name }}</option>
+                                                        </select>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-6">
+                                                <div class="form-group">
+                                                    <label>Archive ID</label>
+                                                    <input type="text" name="arch_id" value="{{$folder->arch_id}}" class="form-control" placeholder="Archive ID" required>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-md-6">
+                                                <div class="form-group">
+                                                    <label>Name</label>
+                                                    <input type="text" name="name" value="{{ $folder->name }}" minlength="2" maxlength="30" class="form-control" placeholder="Name" required>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-6">
+                                                <div class="form-group">
+                                                    <label>Note</label>
+                                                    <textarea class="form-control" name="note" maxlength="80">{{ old('note') }}</textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-md-6">
+                                                <input type="file" class="form-control" id="file-item" name="file_item[]" accept="{{ $fileTypes }}" multiple>
+                                            </div>
+                                        </div>
+                                        <br/>
+                                        <div class="modal-footer">
+                                            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close
+                                            </button>
+                                            <button type="submit" class="btn btn-primary">Save changes</button>
+                                        </div>
+                                    </form>
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+
                 @empty
                     <div class="col-xl-3 col-lg-4 col-md-6 col-sm-12">No items found</div>