diff --git a/examples/local_api.ipynb b/examples/dump.ipynb
similarity index 98%
rename from examples/local_api.ipynb
rename to examples/dump.ipynb
index f7911592..ac306dfb 100644
--- a/examples/local_api.ipynb
+++ b/examples/dump.ipynb
@@ -88,7 +88,7 @@
    "outputs": [],
    "source": [
     "\n",
-    "files = {'upload': ('sorpresa.zip', open('/home/dadokkio/Insync/dadokkio@gmail.com/Google Drive/Lavoro/Agusta/DATA/AMF_MemorySamples/linux/sorpresa.zip','rb'))}\n",
+    "files = {'upload': ('sorpresa.zip', open('/AMF_MemorySamples/linux/sorpresa.zip','rb'))}\n",
     "data = {\n",
     "    'payload': '{\"operating_system\": \"Linux\", \"name\": \"sorpresa\", \"folder\": {\"name\": \"linux-samples\"}}'\n",
     "}\n",
diff --git a/examples/example1.yara b/examples/example1.yara
new file mode 100644
index 00000000..cc93f6ff
--- /dev/null
+++ b/examples/example1.yara
@@ -0,0 +1,9 @@
+rule Example_One
+{
+strings:
+$string1 = "pay"
+$string2 = "immediately"
+
+condition:
+($string1 and $string2)
+}
diff --git a/examples/example2.yara b/examples/example2.yara
new file mode 100644
index 00000000..c7a8df4b
--- /dev/null
+++ b/examples/example2.yara
@@ -0,0 +1,13 @@
+rule Example_Two
+{
+strings:
+$MaliciousWeb1 = "www.scamwebsite.com"
+$MaliciousWeb2 = "www.notrealwebsite.com"
+$Maliciousweb3 = "www.freemoney.com"
+$AttackerName1 = "hackx1203"
+$AttackerName2 = "Hackor"
+$AttackerName3 = "Hax"
+
+condition:
+any of them
+}
diff --git a/examples/rule.ipynb b/examples/rule.ipynb
new file mode 100644
index 00000000..37faa81a
--- /dev/null
+++ b/examples/rule.ipynb
@@ -0,0 +1,279 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 33,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import json\n",
+    "import getpass\n",
+    "from requests import Session\n",
+    "from pprint import pprint\n",
+    "import urllib3\n",
+    "urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)\n",
+    "\n",
+    "url = \"https://localhost\"\n",
+    "user = input()\n",
+    "password = getpass.getpass()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# LOGIN"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 36,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "session = Session()\n",
+    "\n",
+    "first = session.get(f\"{url}\", verify=False)\n",
+    "csrftoken = first.cookies[\"csrftoken\"]\n",
+    "\n",
+    "data = json.dumps(\n",
+    "    {\"username\": user, \"password\": password, \"csrfmiddlewaretoken\": csrftoken}\n",
+    ")\n",
+    "\n",
+    "headers = {\n",
+    "    \"X-CSRFToken\": first.headers[\"Set-Cookie\"].split(\"=\")[1].split(\";\")[0],\n",
+    "    \"Referer\": url,\n",
+    "    \"X-Requested-With\": \"XMLHttpRequest\",\n",
+    "}\n",
+    "\n",
+    "req = session.post(\n",
+    "    f\"{url}/api/auth/\", data=data, cookies=first.cookies, headers=headers, verify=False\n",
+    ")\n",
+    "if req.status_code != 200:\n",
+    "    print(req.text)\n",
+    "    exit(1)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# GET RULE LIST"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 37,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "1 rules returned of 24004\n",
+      "{'headline': '',\n",
+      " 'id': 24313,\n",
+      " 'path_name': 'aaa6.yara',\n",
+      " 'ruleset_description': 'Your crafted ruleset',\n",
+      " 'ruleset_name': 'admin-Ruleset'}\n"
+     ]
+    }
+   ],
+   "source": [
+    "rules = session.get(f\"{url}/api/rules/?start=0&length=1&draw=0\", verify=False).json()\n",
+    "print(f\"{len(rules['data'])} rules returned of {rules['recordsTotal']}\")\n",
+    "if len(rules['data']) > 0: \n",
+    "    pprint(rules['data'][0])\n",
+    "    rule_pk = rules['data'][0]['id']"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# CREATE RULE"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 38,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[{'compiled': False,\n",
+      "  'created': '2024-10-29T14:08:24.507Z',\n",
+      "  'enabled': True,\n",
+      "  'id': 24322,\n",
+      "  'path': '/yara/admin-Ruleset/example13.yar',\n",
+      "  'ruleset': 1,\n",
+      "  'updated': '2024-10-29T14:08:24.507Z'},\n",
+      " {'compiled': False,\n",
+      "  'created': '2024-10-29T14:08:24.514Z',\n",
+      "  'enabled': True,\n",
+      "  'id': 24323,\n",
+      "  'path': '/yara/admin-Ruleset/example24.yar',\n",
+      "  'ruleset': 1,\n",
+      "  'updated': '2024-10-29T14:08:24.514Z'}]\n"
+     ]
+    }
+   ],
+   "source": [
+    "\n",
+    "files = [\n",
+    "    ('files', ('example1.yar', open('./example1.yara','rb'))),\n",
+    "    ('files', ('example2.yar', open('./example2.yara','rb')))\n",
+    "]\n",
+    "res = session.post(f\"{url}/api/rules/\", files=files, cookies=first.cookies, headers=headers, verify=False)\n",
+    "if res.status_code == 200:\n",
+    "    data = res.json() or []\n",
+    "    pprint(res.json())\n",
+    "    rule_pks = [x['id'] for x in data]\n",
+    "else:\n",
+    "    print(res.status_code, res.text)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# BUILD RULE"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 39,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'message': 'Rule combined_rule created'}\n"
+     ]
+    }
+   ],
+   "source": [
+    "data = {\n",
+    "    \"rule_ids\": rule_pks,\n",
+    "    \"rulename\": \"combined_rule\"\n",
+    "}\n",
+    "res = session.post(f\"{url}/api/rules/build\", json=data, cookies=first.cookies, headers=headers, verify=False)\n",
+    "if res.status_code == 200:\n",
+    "    pprint(res.json())\n",
+    "else:\n",
+    "    print(res.status_code, res.text)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# EDIT RULE"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 41,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'message': 'Rule example13.yar updated.'}\n"
+     ]
+    }
+   ],
+   "source": [
+    "data = {\n",
+    "        \"text\": \"rule NewRule { condition: true }\"\n",
+    "    }\n",
+    "res = session.patch(f\"{url}/api/rules/{rule_pks[0]}\",  json=data, cookies=first.cookies, headers=headers, verify=False)\n",
+    "if res.status_code == 200:\n",
+    "    pprint(res.json())\n",
+    "else:\n",
+    "    print(res.status_code, res.text)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# DOWNLOAD RULE"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 44,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "'rule NewRule { condition: true }'\n"
+     ]
+    }
+   ],
+   "source": [
+    "res = session.get(f\"{url}/api/rules/{rule_pks[0]}/download\", cookies=first.cookies, headers=headers, verify=False)\n",
+    "if res.status_code == 200:\n",
+    "    pprint(res.text)\n",
+    "else:\n",
+    "    print(res.status_code, res.text)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# DELETE DUMP"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 45,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "200 {\"message\": \"2 rules deleted.\"}\n"
+     ]
+    }
+   ],
+   "source": [
+    "data = {\n",
+    "    \"rule_ids\": rule_pks\n",
+    "}\n",
+    "res = session.delete(f\"{url}/api/rules/\", json=data, cookies=first.cookies, headers=headers, verify=False)\n",
+    "print(res.status_code, res.text)   "
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "base",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.10.15"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/orochi/api/models.py b/orochi/api/models.py
index 664f589b..9e87d891 100644
--- a/orochi/api/models.py
+++ b/orochi/api/models.py
@@ -1,13 +1,15 @@
 from enum import Enum
+from pathlib import Path
 from typing import Dict, List, Optional
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from ninja import Field, ModelSchema, Schema
 from ninja.orm import create_schema
+from ninja.pagination import PaginationBase
 
 from orochi.website.defaults import OSEnum
-from orochi.website.models import Bookmark, CustomRule, Dump, Folder, Plugin, Result
+from orochi.website.models import Bookmark, CustomRule, Dump, Folder, Plugin
 from orochi.ya.models import Rule
 
 
@@ -271,8 +273,6 @@ class BookmarksInSchema(Schema):
 ###################################################
 # CustomRules
 ###################################################
-
-
 class User(ModelSchema):
 
     class Meta:
@@ -326,3 +326,57 @@ class ListStrAction(Schema):
 
 class RuleEditInSchena(Schema):
     text: str
+
+
+class RuleOut(Schema):
+    id: int
+    ruleset_name: str
+    ruleset_description: str
+    path_name: str
+    headline: Optional[str] = None
+
+
+class Order(Schema):
+    column: int = 1
+    dir: str = Field("asc", pattern="^(asc|desc)$")
+
+
+class RuleFilter(Schema):
+    search: str = None
+    order: Order = None
+
+
+class CustomPagination(PaginationBase):
+    class Input(Schema):
+        start: int
+        length: int
+
+    class Output(Schema):
+        draw: int
+        recordsTotal: int
+        recordsFiltered: int
+        data: List[RuleOut]
+
+    items_attribute: str = "data"
+
+    def paginate_queryset(self, queryset, pagination: Input, **params):
+        request = params["request"]
+        return {
+            "draw": request.draw,
+            "recordsTotal": request.total,
+            "recordsFiltered": queryset.count(),
+            "data": [
+                RuleOut(
+                    **{
+                        "id": x.pk,
+                        "ruleset_name": x.ruleset.name,
+                        "ruleset_description": x.ruleset.description,
+                        "path_name": Path(x.path).name,
+                        "headline": x.headline if request.search else "",
+                    }
+                )
+                for x in queryset[
+                    pagination.start : pagination.start + pagination.length
+                ]
+            ],
+        }
diff --git a/orochi/api/routers/rules.py b/orochi/api/routers/rules.py
index 67d3d543..55a07f67 100644
--- a/orochi/api/routers/rules.py
+++ b/orochi/api/routers/rules.py
@@ -1,18 +1,27 @@
 import os
 from pathlib import Path
+from typing import List
 
 import yara_x
-from django.http import HttpResponse
+from django.contrib.postgres.search import SearchHeadline, SearchQuery
+from django.db import transaction
+from django.db.models import Q
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404
 from extra_settings.models import Setting
-from ninja import Router
+from ninja import File, Query, Router, UploadedFile
+from ninja.pagination import paginate
 from ninja.security import django_auth
 
 from orochi.api.models import (
+    CustomPagination,
     ErrorsOut,
     ListStr,
     RuleBuildSchema,
     RuleEditInSchena,
+    RuleFilter,
+    RuleOut,
+    RulesOutSchema,
     SuccessResponse,
 )
 from orochi.website.models import CustomRule
@@ -21,6 +30,48 @@
 router = Router()
 
 
+@router.get("/", auth=django_auth, url_name="list_rules", response=List[RuleOut])
+@paginate(CustomPagination)
+def list_rules(request: HttpRequest, draw: int, filters: RuleFilter = Query(...)):
+    """Retrieve a list of rules based on the provided filters and pagination.
+
+    This function fetches rules that are either associated with the authenticated user or are public.
+    It supports searching and sorting based on various criteria, returning the results in a paginated format.
+
+    Args:
+        request (HttpRequest): The HTTP request object containing user and query information.
+        draw (int): A draw counter for the DataTables plugin to ensure proper response handling.
+        filters (RuleFilter, optional): An object containing search and order criteria. Defaults to Query(...).
+
+    Returns:
+        List[RuleOut]: A list of rules that match the specified filters and pagination settings.
+    """
+    rules = (
+        Rule.objects.prefetch_related("ruleset")
+        .filter(Q(ruleset__user__isnull=True) | Q(ruleset__user=request.user))
+        .filter(ruleset__enabled=True)
+        .filter(enabled=True)
+    )
+    request.draw = draw
+    request.total = rules.count()
+    request.search = filters.search or None
+
+    if filters.search:
+        query = SearchQuery(filters.search)
+        rules = rules.filter(
+            Q(search_vector=filters.search)
+            | Q(ruleset__name__icontains=filters.search)
+            | Q(ruleset__description__icontains=filters.search)
+            | Q(path__icontains=filters.search)
+        ).annotate(headline=SearchHeadline("rule", query))
+
+    sort_fields = ["id", "ruleset__name", "path"]
+    sort = sort_fields[filters.order.column] if filters.order else sort_fields[0]
+    if filters.order and filters.order.dir == "desc":
+        sort = f"-{sort}"
+    return rules.order_by(sort)
+
+
 @router.patch(
     "/{int:id}",
     auth=django_auth,
@@ -69,7 +120,7 @@ def edit_rule(request, id: int, data: RuleEditInSchena):
 
 
 @router.get("/{int:id}/download", url_name="download_rule", auth=django_auth)
-def download(request, id: int):
+def download_rule(request, id: int):
     """
     Download a rule file by its primary key.
 
@@ -198,3 +249,53 @@ def build_rules(request, info: RuleBuildSchema):
         return 200, {"message": f"Rule {info.rulename} created"}
     except Exception as excp:
         return 400, {"errors": str(excp)}
+
+
+@router.post(
+    "/",
+    url_name="upload_rule",
+    auth=django_auth,
+    response={200: List[RulesOutSchema], 400: ErrorsOut},
+)
+def upload_rule(request, files: List[UploadedFile] = File(...)):
+    """Uploads rules from provided files and associates them with the user's ruleset.
+
+    This function handles the uploading of rule files, ensuring they are saved in a user-specific directory.
+    It creates new rule entries in the database, either with the content of the files or as empty rules if an error occurs during reading.
+
+    Args:
+        request: The HTTP request object containing user information.
+        files (List[UploadedFile]): A list of files to be uploaded.
+
+    Returns:
+        Tuple[int, List[RuleOut] | ErrorsOut]: A tuple containing the HTTP status code and either a list of created rules or error details.
+    """
+    try:
+        rules = []
+        ruleset = get_object_or_404(Ruleset, user=request.user)
+        user_path = f"{Setting.get('LOCAL_YARA_PATH')}/{request.user.username}-Ruleset"
+        os.makedirs(user_path, exist_ok=True)
+        with transaction.atomic():
+            for f in files:
+                new_path = f"{user_path}/{f.name}"
+                filename, extension = os.path.splitext(new_path)
+                counter = 1
+                while os.path.exists(new_path):
+                    new_path = f"{filename}{counter}{extension}"
+                    counter += 1
+                with open(new_path, "wb") as uf:
+                    uf.write(f.read())
+                try:
+                    rule = Rule.objects.create(
+                        path=new_path,
+                        ruleset=ruleset,
+                        rule=open(new_path, "rb").read().decode("utf8", "replace"),
+                    )
+                except Exception:
+                    rule = Rule.objects.create(
+                        path=new_path, ruleset=ruleset, rule=None
+                    )
+                rules.append(rule)
+        return 200, rules
+    except Exception as excp:
+        return 400, {"errors": str(excp)}
diff --git a/orochi/templates/users/user_rules.html b/orochi/templates/users/user_rules.html
index c2c1c6b5..1edc1c16 100644
--- a/orochi/templates/users/user_rules.html
+++ b/orochi/templates/users/user_rules.html
@@ -99,7 +99,17 @@
       "orderCellsTop": true,
       "lengthMenu": [[50, 100, 250, 500, 1000], [50, 100, 250, 500, 1000]],
       "ajax": {
-        "url": "{% url 'ya:list' %}",
+        "url": "{% url 'api:list_rules' %}",
+        data: function (d) {
+          delete d.columns;
+          if (d.order.length > 0) {
+            d.order = d.order[0];
+          }
+          if (d.search && d.search.value) {
+            d.search = d.search.value;
+          }
+          return d;
+        }
       },
       'columnDefs': [
         {
@@ -111,19 +121,20 @@
 
       ],
       'columns': [
-        { 'data': '0' },
+        { 'data': 'id' },
         {
+          'data': 'ruleset_name',
           render: function (data, type, row, meta) {
-            return `${row[1]} <span title="${row[2]}"><i class="fas fa-circle-info"></i></span>`;
+            return `${row.ruleset_name} <span title="${row.ruleset_description}"><i class="fas fa-circle-info"></i></span>`;
           }
         },
-        { 'data': '3' },
-        { 'data': '4' },
+        { 'data': 'path_name' },
+        { 'data': 'headline' },
         {
           sortable: false,
           render: function (data, type, row, meta) {
-            let down = `<a href='/api/rules/${row[0]}/download' type='button' class='btn btn btn-outline' target='_blank'><i class='fa fa-download'></i></a>`;
-            down += `<button class='btn btn btn-outline btn-show' data-id='${row[0]}'><i class='fa fa-edit'></i></button>`;
+            let down = `<a href='/api/rules/${row.id}/download' type='button' class='btn btn btn-outline' target='_blank'><i class='fa fa-download'></i></a>`;
+            down += `<button class='btn btn btn-outline btn-show' data-id='${row.id}'><i class='fa fa-edit'></i></button>`;
             return down;
           }
         }
@@ -292,6 +303,48 @@
     });
 
     // UPLOAD RULE FORM SUBMIT
+    $(document).on("submit", "#upload-form", function (e) {
+      e.preventDefault();
+      var form = $(this);
+      let formData = new FormData();
+      const fileInput = form.find('input[type="file"]');
+      const files = fileInput[0].files;
+      for (let i = 0; i < files.length; i++) {
+        formData.append('files', files[i]);
+      }
+      $.ajaxSetup({ headers: { 'X-CSRFToken': $('input[name="csrfmiddlewaretoken"]').val() } });
+
+      $.ajax({
+        url: form.attr("action"),
+        data: formData,
+        type: 'POST',
+        contentType: false,
+        processData: false,
+        dataType: 'json',
+        success: function (data) {
+          $("#modal-update").modal('hide');
+          table.ajax.reload();
+          $.toast({
+            title: 'Rules added!',
+            content: data.length + " rule(s) added!",
+            type: 'success',
+            delay: 5000
+          });
+        },
+        error: function (data) {
+          $.toast({
+            title: 'Error!',
+            content: data.errors,
+            type: 'error',
+            delay: 5000
+          });
+        },
+      });
+    });
+
+
+
+    // EDIT RULE FORM SUBMIT
     $(document).on("submit", "#edit-rule", function (e) {
       e.preventDefault();
       var form = $(this);
@@ -333,7 +386,7 @@
       });
     });
 
-    // SHOW RULE
+    // SHOW/EDIT RULE
     $(document).on("click", '.btn-show', function (e) {
       e.preventDefault();
       var pk = $(this).data('id');
diff --git a/orochi/templates/website/index.html b/orochi/templates/website/index.html
index a9622c93..5dc21422 100644
--- a/orochi/templates/website/index.html
+++ b/orochi/templates/website/index.html
@@ -78,35 +78,42 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
 <script src="{% static 'file_form/file_form.js' %}"></script>
 <script type="text/javascript">
   $(document).ready(function () {
-
-    var maxmind_template = Handlebars.templates.maxmind;
-    var dump_template = Handlebars.templates.dump;
-    var dump_folder_template = Handlebars.templates.dump_folder;
-    var vt_template = Handlebars.templates.vt;
-    var plugin_template = Handlebars.templates.plugins;
-    Handlebars.registerHelper('json', function (context) {
-      return JSON.stringify(context);
-    });
+    // Cache frequently used selectors
+    const $modal = $("#modal-update");
+    const $modalContent = $modal.find(".modal-content");
+    const $mainStage = $('#main_stage');
+    const $indexList = $("#index-list");
+    const $listPlugin = $("#list_plugin");
+
+    // Use const for variables that don't change
+    const maxmindTemplate = Handlebars.templates.maxmind;
+    const dumpTemplate = Handlebars.templates.dump;
+    const dumpFolderTemplate = Handlebars.templates.dump_folder;
+    const vtTemplate = Handlebars.templates.vt;
+    const pluginTemplate = Handlebars.templates.plugins;
+
+    // Register Handlebars helpers
+    Handlebars.registerHelper('json', JSON.stringify);
     Handlebars.registerHelper('ifeq', function (a, b, options) {
-      if (a == b) { return options.fn(this); }
-      return options.inverse(this);
+      return a == b ? options.fn(this) : options.inverse(this);
     });
 
     // RESTORE INDEXES AND PLUGIN IF BOOKMARKS
-    var selected_indexes = {{ selected_indexes| safe }};
-    var selected_plugin = {% if not selected_plugin %}null{% else %} "{{selected_plugin}}"{% endif %};
-    var selected_query = {% if not selected_query %}null{% else %} "{{selected_query}}"{% endif %};
-
-    window.onpopstate = function(event) {
-      if(event && event.state) {
-        selected_plugin = event.state.selected_plugin;
-        selected_indexes = event.state.selected_indexes;
-        update_sidebar();
+    let selectedIndexes = {{ selected_indexes| safe }};
+    let selectedPlugin = {% if not selected_plugin %}null{% else %}"{{selected_plugin}}"{% endif %};
+    let selectedQuery = {% if not selected_query %}null{% else %}"{{selected_query}}"{% endif %};
+
+    // Use arrow functions for better readability
+    window.onpopstate = (event) => {
+      if (event && event.state) {
+        selectedPlugin = event.state.selectedPlugin;
+        selectedIndexes = event.state.selectedIndexes;
+        updateSidebar();
       }
-    }
+    };
 
-    if (selected_plugin && selected_indexes.length > 0) {
-      selected_indexes.forEach(element => {
+    if (selectedPlugin && selectedIndexes.length > 0) {
+      selectedIndexes.forEach(element => {
         var label = $('#index-list li label').filter('[data-index="' + element + '"]');
         if (label.length == 1) {
           checkbox = $(".check_container :checkbox", label.parent());
@@ -142,8 +149,8 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
       e.preventDefault();
       var form = $(this);
 
-      $("#id_selected_indexes").val(selected_indexes);
-      $("#id_selected_plugin").val(selected_plugin);
+      $("#id_selected_indexes").val(selectedIndexes);
+      $("#id_selected_plugin").val(selectedPlugin);
       var table = $('#example').DataTable();
       $("#id_query").val(table.search());
 
@@ -237,10 +244,10 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
           $("#modal-update").modal("show");
         },
         success: function (data) {
-          $("#modal-update .modal-content").html(vt_template(data));
+          $("#modal-update .modal-content").html(vtTemplate(data));
         },
         error: function (data) {
-          $("#modal-update .modal-content").html(vt_template(data.responseJSON));
+          $("#modal-update .modal-content").html(vtTemplate(data.responseJSON));
         }
       });
     });
@@ -260,133 +267,138 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
           $("#modal-update").modal("show");
         },
         success: function (data) {
-          $("#modal-update .modal-content").html(maxmind_template(data));
+          $("#modal-update .modal-content").html(maxmindTemplate(data));
         },
         error: function (data) {
-          $("#modal-update .modal-content").html(maxmind_template(data.responseJSON));
+          $("#modal-update .modal-content").html(maxmindTemplate(data.responseJSON));
         }
       });
     });
 
-    // UPDATE MAIN STAGE AFTER INDEX, PLUGIN CHANGE
-    function update_main_stage() {
-      if (selected_plugin == null || selected_indexes.length == 0) {
-        window.history.pushState({selected_plugin: null, selected_indexes: null}, "", "/");
-        $('#main_stage').html('<div class="alert alert-primary" role="alert">Select index(es) and plugin!</div>');
+    // Optimize updateMainStage function
+    function updateMainStage() {
+      if (selectedPlugin == null || selectedIndexes.length == 0) {
+        window.history.pushState({selectedPlugin: null, selectedIndexes: null}, "", "/");
+        $mainStage.html('<div class="alert alert-primary" role="alert">Select index(es) and plugin!</div>');
+        return;
       }
-      else {
-        window.history.pushState(
-          {selected_plugin: selected_plugin, selected_indexes: selected_indexes},
-          "",
-          "/indexes/" + selected_indexes.join(",") + "/plugin/" + selected_plugin
-        );
-        $.get("{% url 'website:analysis' %}", { 'indexes': selected_indexes, 'plugin': selected_plugin })
-          .done(function (data) {
-
-            // ON TOP SEARCH IN TABLE
-            $("#main_stage").html(data);
-
-            columns = [];
-            $("#example tr th").each(function () { columns.push($(this).text()) });
-
-            if (columns.length > 0) {
-              var not_filter = ["orochi_color", "__children", "actions", "Loading", "Empty", "Disabled", "Not started"];
-              table = $("#example").DataTable({
-                scrollY: 600,
-                scrollX: true,
-                ordering: true,
-                initComplete: function () {
-                  this.api()
-                    .columns()
-                    .every(function () {
-                      let column = this;
-                      let title = column.footer().textContent;
-                      if (not_filter.indexOf(title) <= -1) {
-                        let input = document.createElement('input');
-                        input.id = title;
-                        input.className = 'headFilter';
-                        input.placeholder = title;
-                        column.footer().replaceChildren(input);
-
-                        input.addEventListener('keyup', () => {
-                          if (column.search() !== this.value) {
-                            column.search(input.value).draw();
-                          }
-                        });
-                      }
-                    });
-                },
-                ajax: {
-                  url: "{% url 'website:generate' %}",
-                  data: function (d) {
-                    d.indexes = selected_indexes;
-                    d.plugin = selected_plugin;
-                    d.columns = columns;
-                    var map_filter = [];
-                    $(".headFilter").each(function () {
-                      if($(this).attr("id") && $(this).val()){
-                        map_filter.push($(this).attr("id") + "___" + $(this).val());
-                      }
-                    });
-                    d.filters = map_filter;
-                  }
-                },
-                "columnDefs": [
-                  {
-                    "targets": "maxmind",
-                    "render": function (data, type, row, meta) {
-                      tmp_data = data.replace(/^"(.*)"$/, '$1')
-                      if (!(["0.0.0.0", "*", "::", ""].includes(tmp_data))) {
-                        return data + ' <a class="btn btn-sm btn-primary maxmind-info" data-ip="' + tmp_data + '" href="#"><i class="fa-solid fa-map-location"></i></a>';
-                      } else {
-                        return data;
-                      }
-                    }
-                  },
-                  {
-                    "targets": "orochi_color",
-                    "orderable": false
-                  },
-                  {
-                    "targets": "__children",
-                    "orderable": false
-                  },
-                  {
-                    "targets": "actions",
-                    "orderable": false
-                  }
-                ],
-                processing: true,
-                serverSide: true
+
+      window.history.pushState(
+        {selected_plugin: selectedPlugin, selectedIndexes: selectedIndexes},
+        "",
+        `/indexes/${selectedIndexes.join(",")}/plugin/${selectedPlugin}`
+      );
+
+      $.get("{% url 'website:analysis' %}", { indexes: selectedIndexes, plugin: selectedPlugin })
+        .done(function (data) {
+          $mainStage.html(data);
+
+          const columns = $("#example tr th").map(function() { return $(this).text(); }).get();
+
+          if (columns.length > 0) {
+            initializeDataTable(columns);
+          }
+
+          // MANAGE AUTOREFRESH
+          const running = $(".text-bg-info").length;
+          const autorefresh = localStorage.getItem("autorefresh") === "true";
+          if (running > 0 && autorefresh) {
+            setTimeout(updateMainStage, 5000);
+          }
+        })
+        .fail(function () {
+          $mainStage.html('<div class="alert alert-primary" role="alert">Select index(es) and plugin!</div>');
+          showToast('Plugin results!', 'Error showing plugin results.', 'error');
+        });
+    }
+
+    // Extract DataTable initialization to a separate function
+    function initializeDataTable(columns) {
+      const notFilter = ["orochi_color", "__children", "actions", "Loading", "Empty", "Disabled", "Not started"];
+      const table = $("#example").DataTable({
+        scrollY: 600,
+        scrollX: true,
+        ordering: true,
+        initComplete: function () {
+          this.api().columns().every(function () {
+            const column = this;
+            const title = column.footer().textContent;
+            if (!notFilter.includes(title)) {
+              const input = document.createElement('input');
+              input.id = title;
+              input.className = 'headFilter';
+              input.placeholder = title;
+              column.footer().replaceChildren(input);
+
+              input.addEventListener('keyup', () => {
+                if (column.search() !== input.value) {
+                  column.search(input.value).draw();
+                }
               });
-              // RESTORE SEARCH FROM BOOKMARKS
-              if (selected_query != null) {
-                table.search(selected_query).draw();
-                selected_query = null;
+            }
+          });
+        },
+        ajax: {
+          url: "{% url 'website:generate' %}",
+          data: function (d) {
+            d.indexes = selectedIndexes;
+            d.plugin = selectedPlugin;
+            d.columns = columns;
+            var map_filter = [];
+            $(".headFilter").each(function () {
+              if($(this).attr("id") && $(this).val()){
+                map_filter.push($(this).attr("id") + "___" + $(this).val());
+              }
+            });
+            d.filters = map_filter;
+          }
+        },
+        "columnDefs": [
+          {
+            "targets": "maxmind",
+            "render": function (data, type, row, meta) {
+              tmp_data = data.replace(/^"(.*)"$/, '$1')
+              if (!(["0.0.0.0", "*", "::", ""].includes(tmp_data))) {
+                return data + ' <a class="btn btn-sm btn-primary maxmind-info" data-ip="' + tmp_data + '" href="#"><i class="fa-solid fa-map-location"></i></a>';
+              } else {
+                return data;
               }
             }
+          },
+          {
+            "targets": "orochi_color",
+            "orderable": false
+          },
+          {
+            "targets": "__children",
+            "orderable": false
+          },
+          {
+            "targets": "actions",
+            "orderable": false
+          }
+        ],
+        processing: true,
+        serverSide: true
+      });
 
-            // MANAGE AUTOREFRESH
-            var running = $(".text-bg-info").length;
-            var autorefresh = localStorage.getItem("autorefresh");
-            if (autorefresh == "true" || autorefresh == true) { autorefresh = true; }
-            if (autorefresh == "false" || autorefresh == false) { autorefresh = false; }
-            if (running > 0 && autorefresh) {
-              setTimeout(function () { update_main_stage(); }, 5000);
-            }
-          })
-          .fail(function () {
-            $('#main_stage').html('<div class="alert alert-primary" role="alert">Select index(es) and plugin!</div>');
-            $.toast({
-              title: 'Plugin results!',
-              content: 'Error showing plugin results.',
-              type: 'error',
-              delay: 5000
-            });
-          });
+      // RESTORE SEARCH FROM BOOKMARKS
+      if (selectedQuery != null) {
+        table.search(selectedQuery).draw();
+        selectedQuery = null;
       }
     }
 
+    // Create a reusable function for showing toasts
+    function showToast(title, content, type) {
+      $.toast({
+        title: title,
+        content: content,
+        type: type,
+        delay: 5000
+      });
+    }
+
     // REFRESH DUMP/PLUGIN CHECKBOXS
     function update_sidebar() {
       var indexes = [];
@@ -404,9 +416,9 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
             method: 'get',
             dataType: 'json',
             success: function (data) {
-              $("#list_plugin").append(plugin_template(data))
-              if(selected_plugin){
-                var label = $('#list_plugin li label').filter('[data-plugin="' + selected_plugin + '"]');
+              $("#list_plugin").append(pluginTemplate(data))
+              if(selectedPlugin){
+                var label = $('#list_plugin li label').filter('[data-plugin="' + selectedPlugin + '"]');
                 checkbox = $(":radio", label.parent());
                 checkbox.prop('checked', true);
               }
@@ -414,8 +426,8 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
           });
         }
       }
-      selected_indexes = indexes;
-      update_main_stage();
+      selectedIndexes = indexes;
+      updateMainStage();
     }
 
     // ADD OR REMOVE INDEX REFRESH DATA AND AVAILABLE PLUGINS
@@ -434,8 +446,8 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
 
     // GET ANALYSIS RESULT DATA
     $(document).on('click', 'input[type=radio][name=radio]', function () {
-      selected_plugin = $(this).parents('li').find('label').data('plugin');
-      update_main_stage();
+      selectedPlugin = $(this).parents('li').find('label').data('plugin');
+      updateMainStage();
     });
 
     // SHOW ERROR LOG
@@ -526,7 +538,7 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
             type: 'success',
             delay: 5000
           });
-          update_main_stage();
+          updateMainStage();
         },
         error: function () {
           $.toast({
@@ -628,12 +640,12 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
             ul_name = '#folder_' + data.folder.name;
           }
           if($(ul_name).length > 0){
-            $(ul_name).append(dump_template(data));
+            $(ul_name).append(dumpTemplate(data));
           }else{
-            $("#index-list").html(dump_folder_template(data));
+            $("#index-list").html(dumpFolderTemplate(data));
           }
           $("#modal-update").modal('hide');
-          selected_plugin = null;
+          selectedPlugin = null;
           update_sidebar();
         },
         error: function () {
@@ -752,7 +764,7 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
         type: 'get',
         dataType: 'json',
         success: function (data) {
-          selected_plugin = null;
+          selectedPlugin = null;
           update_sidebar();
         }
       });
@@ -793,7 +805,7 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
           if (data.form_is_valid) {
             $("#index-list").html(data.dumps);
             $("#modal-update").modal('hide');
-            selected_plugin = null;
+            selectedPlugin = null;
             update_sidebar();
           } else {
             $("#modal-update .modal-content").html(data.html_form);
@@ -869,7 +881,7 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
         dataType: 'json',
         success: function () {
           $("#modal-update").modal('hide');
-          selected_plugin = null;
+          selectedPlugin = null;
           update_sidebar();
           $.toast({
             title: 'Index updated!',
@@ -908,10 +920,10 @@ <h5 class="offcanvas-title" id="leftNoteLabel">History Log</h5>
             success: function (data) {
               btn.parent().parent().parent().remove();
               // REMOVE INDEX FROM SELECTED LIST
-              selected_indexes = selected_indexes.filter(function (item) {
+              selectedIndexes = selectedIndexes.filter(function (item) {
                 return item !== index;
               });
-              selected_plugin = null;
+              selectedPlugin = null;
               update_sidebar();
               $.toast({
                 title: 'Index delete!',
diff --git a/orochi/templates/ya/partial_rule_edit.html b/orochi/templates/ya/partial_rule_edit.html
index 4130979f..685f959a 100644
--- a/orochi/templates/ya/partial_rule_edit.html
+++ b/orochi/templates/ya/partial_rule_edit.html
@@ -26,6 +26,6 @@ <h5 class="modal-title">Edit rule</h5>
     </div>
     <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-        <button type="submit" class="btn btn-primary button-loader" id="btn_rules_add">Edit Rule</button>
+        <button type="submit" class="btn btn-primary button-loader">Edit Rule</button>
     </div>
 </form>
diff --git a/orochi/templates/ya/partial_rule_upload.html b/orochi/templates/ya/partial_rule_upload.html
index 885d9065..728341a1 100644
--- a/orochi/templates/ya/partial_rule_upload.html
+++ b/orochi/templates/ya/partial_rule_upload.html
@@ -1,6 +1,6 @@
 {% load widget_tweaks %}
 
-<form method="post" action="{% url 'ya:upload' %}" id="rules-index">
+<form method="post" action="{% url 'api:upload_rule' %}" id="upload-form">
     {{ form.media }}
     {% csrf_token %}
     <div class="modal-header">
@@ -23,6 +23,6 @@ <h5 class="modal-title">Upload rules in your ruleset</h5>
     </div>
     <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-        <button type="submit" class="btn btn-primary button-loader" id="btn_rules_add">Confirm</button>
+        <button type="submit" class="btn btn-primary button-loader">Confirm</button>
     </div>
 </form>
diff --git a/orochi/website/views.py b/orochi/website/views.py
index 84e53669..d8af34a6 100644
--- a/orochi/website/views.py
+++ b/orochi/website/views.py
@@ -29,7 +29,7 @@
 from django.utils.text import slugify
 from django.views.decorators.http import require_http_methods
 from extra_settings.models import Setting
-from guardian.shortcuts import assign_perm, get_objects_for_user, get_perms, remove_perm
+from guardian.shortcuts import get_objects_for_user, get_perms
 from pymisp import MISPEvent, MISPObject, PyMISP
 from pymisp.tools import FileObject
 from volatility3.framework import automagic, contexts
@@ -483,7 +483,7 @@ def analysis(request):
                 elif res.result == RESULT_STATUS_SUCCESS:
                     value_columns = (
                         Value.objects.filter(result=res).values("value").first()
-                    )
+                    ) or {}
                     # GET COLUMNS FROM ELASTIC
                     columns = (
                         [
diff --git a/orochi/ya/urls.py b/orochi/ya/urls.py
index d001d7e7..9e6fd10b 100644
--- a/orochi/ya/urls.py
+++ b/orochi/ya/urls.py
@@ -10,7 +10,6 @@
         views.generate_default_rule,
         name="generate_default_rule",
     ),
-    path("list", views.list_rules, name="list"),
     path("upload", views.upload, name="upload"),
     path("detail", views.detail, name="detail"),
 ]
diff --git a/orochi/ya/views.py b/orochi/ya/views.py
index 9d24b5aa..aec34035 100644
--- a/orochi/ya/views.py
+++ b/orochi/ya/views.py
@@ -1,20 +1,13 @@
-import os
-import shutil
-from pathlib import Path
-
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.postgres.search import SearchHeadline, SearchQuery
 from django.core import management
-from django.db.models import Q
 from django.http import Http404, JsonResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.loader import render_to_string
 from django.views.decorators.http import require_http_methods
-from extra_settings.models import Setting
 
 from orochi.ya.forms import EditRuleForm, RuleForm
-from orochi.ya.models import Rule, Ruleset
+from orochi.ya.models import Rule
 
 
 def update_rules(request):
@@ -39,89 +32,34 @@ def generate_default_rule(request):
     raise Http404("404")
 
 
-@login_required
-def list_rules(request):
-    """
-    Ajax rules return for datatables
-    """
-    draw = request.GET.get("draw")
-    start = int(request.GET.get("start"))
-    length = int(request.GET.get("length"))
-    search = request.GET.get("search[value]")
-
-    try:
-        sort_column = int(request.GET.get("order[0][column]"))
-        sort_order = request.GET.get("order[0][dir]")
-    except TypeError:
-        sort_column = 0
-        sort_order = "asc"
-
-    rules = (
-        Rule.objects.prefetch_related("ruleset")
-        .filter(Q(ruleset__user__isnull=True) | Q(ruleset__user=request.user))
-        .filter(ruleset__enabled=True)
-        .filter(enabled=True)
-    )
-    total = rules.count()
-
-    if search:
-        query = SearchQuery(search)
-        rules = rules.filter(
-            Q(search_vector=search)
-            | Q(ruleset__name__icontains=search)
-            | Q(ruleset__description__icontains=search)
-            | Q(path__icontains=search)
-        ).annotate(headline=SearchHeadline("rule", query))
-    sort = ["id", "ruleset", "path"][sort_column]
-    sort = f"-{sort}" if sort_order == "desc" else sort
-    rules = rules.order_by(sort)[start : start + length]
-
-    return_data = {
-        "draw": draw,
-        "recordsTotal": total,
-        "recordsFiltered": total,
-        "data": [
-            [
-                x.pk,
-                x.ruleset.name,
-                x.ruleset.description,
-                Path(x.path).name,
-                x.headline if search else "",
-            ]
-            for x in rules
-        ],
-    }
-    return JsonResponse(return_data)
-
-
 @require_http_methods(["GET"])
 @login_required
 def detail(request):
     """
-    Return content of rule
+    Form to edit rule
     """
     pk = request.GET.get("pk")
     rule = get_object_or_404(Rule, pk=pk)
     try:
         with open(rule.path, "rb") as f:
             rule_data = f.read()
-        context = {
-            "form": EditRuleForm(
-                initial={
-                    "text": "".join(rule_data.decode("utf-8", "replace")),
-                    "pk": rule.pk,
-                }
-            ),
-            "id": rule.pk,
-        }
-        data = {
-            "html_form": render_to_string(
-                "ya/partial_rule_edit.html",
-                context,
-                request=request,
-            )
-        }
-        return JsonResponse(data)
+        return JsonResponse(
+            {
+                "html_form": render_to_string(
+                    "ya/partial_rule_edit.html",
+                    {
+                        "form": EditRuleForm(
+                            initial={
+                                "text": "".join(rule_data.decode("utf-8", "replace")),
+                                "pk": rule.pk,
+                            }
+                        ),
+                        "id": rule.pk,
+                    },
+                    request=request,
+                )
+            }
+        )
     except UnicodeDecodeError as e:
         raise Http404 from e
 
@@ -129,48 +67,14 @@ def detail(request):
 @login_required
 def upload(request):
     """
-    Manage yara rule upload to user ruleset
+    Form to upload yara files in rule management
     """
-    data = {}
-    if request.method == "POST":
-        form = RuleForm(data=request.POST)
-        ruleset = get_object_or_404(Ruleset, user=request.user)
-        if form.is_valid():
-            file_list = [
-                (rule.file.path, rule.name) for rule in form.cleaned_data["rules"]
-            ]
-            for path, name in file_list:
-                user_path = (
-                    f"{Setting.get('LOCAL_YARA_PATH')}/{request.user.username}-Ruleset"
-                )
-                os.makedirs(user_path, exist_ok=True)
-                new_path = f"{user_path}/{name}"
-                filename, extension = os.path.splitext(new_path)
-                counter = 1
-                while os.path.exists(new_path):
-                    new_path = f"{filename}{counter}{extension}"
-                    counter += 1
-
-                shutil.move(
-                    path,
-                    new_path,
-                )
-                try:
-                    Rule.objects.create(
-                        path=new_path,
-                        ruleset=ruleset,
-                        rule=open(new_path, "rb").read().decode("utf8", "replace"),
-                    )
-                except Exception:
-                    Rule.objects.create(path=new_path, ruleset=ruleset, rule=None)
-            return JsonResponse({"ok": True})
-        raise Http404
-
-    form = RuleForm()
-    context = {"form": form}
-    data["html_form"] = render_to_string(
-        "ya/partial_rule_upload.html",
-        context,
-        request=request,
+    return JsonResponse(
+        {
+            "html_form": render_to_string(
+                "ya/partial_rule_upload.html",
+                {"form": RuleForm()},
+                request=request,
+            )
+        }
     )
-    return JsonResponse(data)