diff --git a/Modules/CircleApps/App/Http/Middleware/CheckAccountAppAccess.php b/Modules/CircleApps/App/Http/Middleware/CheckAccountAppAccess.php
new file mode 100644
index 0000000..72cdbd3
--- /dev/null
+++ b/Modules/CircleApps/App/Http/Middleware/CheckAccountAppAccess.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\CircleApps\App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class CheckAccountAppAccess
+{
+
+    /**
+     * Handle an incoming request.
+     */
+    public function handle(Request $request, Closure $next, string $app)
+    {
+        if(auth('accounts')->user() && (!has_app($app))) {
+            abort(403, 'Unauthorized');
+        }
+
+        return $next($request);
+    }
+}
diff --git a/Modules/CircleApps/App/Providers/CircleAppsServiceProvider.php b/Modules/CircleApps/App/Providers/CircleAppsServiceProvider.php
index 2d3a5b8..f179a1d 100644
--- a/Modules/CircleApps/App/Providers/CircleAppsServiceProvider.php
+++ b/Modules/CircleApps/App/Providers/CircleAppsServiceProvider.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use Modules\CircleApps\App\Http\Middleware\CheckAccountAppAccess;
 use Modules\TomatoCategory\App\Facades\TomatoCategory;
 use Modules\TomatoCategory\App\Models\Category;
 
@@ -43,6 +44,8 @@ public function boot(): void
         $this->app->bind('circle-apps-menu', function () {
             return new \Modules\CircleApps\App\Services\CircleAppsMenuServices();
         });
+
+        $this->app['router']->aliasMiddleware('app', CheckAccountAppAccess::class);
     }
 
     public function registerComponents(): void
diff --git a/Modules/CircleApps/App/Providers/helpers.php b/Modules/CircleApps/App/Providers/helpers.php
index 3c9ee95..5a76730 100644
--- a/Modules/CircleApps/App/Providers/helpers.php
+++ b/Modules/CircleApps/App/Providers/helpers.php
@@ -1,12 +1,21 @@
 <?php
 
 if(!function_exists('has_app')) {
-    function has_app(string $key): bool
+    function has_app(string $key, ?int $account=null): bool
     {
         if(auth('accounts')->user()){
             $hasApp = auth('accounts')->user()->apps()->where('key', $key)->first();
             if($hasApp){
-                return  true;
+                if($account){
+                    if($account == auth('accounts')->user()->id){
+                        return true;
+                    }
+                    else {
+                        return false;
+                    }
+                }
+
+                return true;
             }
         }
 
diff --git a/Modules/CircleApps/resources/views/show.blade.php b/Modules/CircleApps/resources/views/show.blade.php
index 5fbed6d..2d0ba79 100644
--- a/Modules/CircleApps/resources/views/show.blade.php
+++ b/Modules/CircleApps/resources/views/show.blade.php
@@ -161,5 +161,6 @@
                     </div>
                 </div>
             </div>
+        </div>
     </div>
 </x-circle-xo-app-layout>
diff --git a/Modules/CircleApps/routes/web.php b/Modules/CircleApps/routes/web.php
index dd78f36..ff78cfa 100644
--- a/Modules/CircleApps/routes/web.php
+++ b/Modules/CircleApps/routes/web.php
@@ -14,15 +14,15 @@
 |
 */
 
-//Route::middleware(['web', 'splade'])->prefix('apps')->name('apps.')->group(function () {
-//    Route::get('/', [CircleAppsController::class, 'index'])->name('index');
-//    Route::get('/{app}', [CircleAppsController::class, 'show'])->name('show');
-//});
-//
-//Route::middleware(['web', 'splade', 'auth:accounts'])->prefix('apps')->name('apps.')->group(function () {
-//    Route::post('/{app}/install', [CircleAppsController::class, 'install'])->name('install');
-//    Route::post('/{app}/uninstall', [CircleAppsController::class, 'uninstall'])->name('uninstall');
-//});
+Route::middleware(['web', 'splade'])->prefix('apps')->name('apps.')->group(function () {
+    Route::get('/', [CircleAppsController::class, 'index'])->name('index');
+    Route::get('/{app}', [CircleAppsController::class, 'show'])->name('show');
+});
+
+Route::middleware(['web', 'splade', 'auth:accounts'])->prefix('apps')->name('apps.')->group(function () {
+    Route::post('/{app}/install', [CircleAppsController::class, 'install'])->name('install');
+    Route::post('/{app}/uninstall', [CircleAppsController::class, 'uninstall'])->name('uninstall');
+});
 
 Route::middleware(['auth', 'splade', 'verified'])->name('admin.')->group(function () {
     Route::get('admin/apps', [\Modules\CircleApps\App\Http\Controllers\AppController::class, 'index'])->name('apps.index');
diff --git a/Modules/CircleContacts/App/Forms/.gitkeep b/Modules/CircleContacts/App/Forms/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Http/Controllers/.gitkeep b/Modules/CircleContacts/App/Http/Controllers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Http/Controllers/CircleContactsController.php b/Modules/CircleContacts/App/Http/Controllers/CircleContactsController.php
new file mode 100644
index 0000000..a87ae95
--- /dev/null
+++ b/Modules/CircleContacts/App/Http/Controllers/CircleContactsController.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Modules\CircleContacts\App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class CircleContactsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('circlecontacts::index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('circlecontacts::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        return view('circlecontacts::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        return view('circlecontacts::edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/Modules/CircleContacts/App/Http/Controllers/CircleXoContactController.php b/Modules/CircleContacts/App/Http/Controllers/CircleXoContactController.php
new file mode 100644
index 0000000..e2d339c
--- /dev/null
+++ b/Modules/CircleContacts/App/Http/Controllers/CircleXoContactController.php
@@ -0,0 +1,197 @@
+<?php
+
+namespace Modules\CircleContacts\App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+use Modules\CircleContacts\App\Http\Requests\CircleXoContact\CircleXoContactStoreRequest;
+use Modules\CircleContacts\App\Http\Requests\CircleXoContact\CircleXoContactUpdateRequest;
+use Modules\CircleContacts\App\Models\CircleXoContact;
+use TomatoPHP\TomatoAdmin\Facade\Tomato;
+
+class CircleXoContactController extends Controller
+{
+    public string $model;
+
+    public function __construct()
+    {
+        $this->model = \Modules\CircleContacts\App\Models\CircleXoContact::class;
+    }
+
+    /**
+     * @param Request $request
+     * @return View|JsonResponse
+     */
+    public function index(Request $request): View|JsonResponse
+    {
+        $query = CircleXoContact::query();
+        $query->where('account_id', auth('accounts')->user()->id);
+        if($request->has('group_id')){
+            $query->whereHas('groups', function ($query) use ($request){
+                $query->where('id', $request->get('group_id'));
+            });
+        }
+
+        return Tomato::index(
+            request: $request,
+            model: $this->model,
+            view: 'circle-contacts::contacts.index',
+            table: \Modules\CircleContacts\App\Tables\CircleXoContactTable::class,
+            query: $query
+        );
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function api(Request $request): JsonResponse
+    {
+        $query = CircleXoContact::query();
+        $query->where('account_id', auth('accounts')->user()->id);
+        return Tomato::json(
+            request: $request,
+            model: \Modules\CircleContacts\App\Models\CircleXoContact::class,
+            query: $query
+        );
+    }
+
+    /**
+     * @return View
+     */
+    public function create(): View
+    {
+        return Tomato::create(
+            view: 'circle-contacts::contacts.create',
+        );
+    }
+
+    /**
+     * @param CircleXoContactStoreRequest $request
+     * @return RedirectResponse|JsonResponse
+     */
+    public function store(CircleXoContactStoreRequest $request): RedirectResponse|JsonResponse
+    {
+        $request->merge([
+           "account_id" => auth('accounts')->user()->id
+        ]);
+        $response = Tomato::store(
+            request: $request,
+            model: \Modules\CircleContacts\App\Models\CircleXoContact::class,
+            message: __('Contact saved successfully'),
+            redirect: 'profile.contacts.index',
+            hasMedia: true,
+            collection: [
+                'avatar' => false,
+            ]
+        );
+
+        $response->record->groups()->sync($request->get('groups'));
+
+        if($response instanceof JsonResponse){
+            return $response;
+        }
+
+        return back();
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Models\CircleXoContact $model
+     * @return View|JsonResponse
+     */
+    public function show(\Modules\CircleContacts\App\Models\CircleXoContact $model): View|JsonResponse
+    {
+        if(!has_app('circle-contacts', $model->account_id)){
+            abort(403);
+        }
+
+        return Tomato::get(
+            model: $model,
+            view: 'circle-contacts::contacts.show',
+            hasMedia: true,
+            collection: [
+                'avatar' => false,
+            ]
+        );
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Models\CircleXoContact $model
+     * @return View
+     */
+    public function edit(\Modules\CircleContacts\App\Models\CircleXoContact $model): View
+    {
+        if(!has_app('circle-contacts', $model->account_id)){
+            abort(403);
+        }
+
+        $model->groups = $model->groups->pluck('id')->toArray();
+        return Tomato::get(
+            model: $model,
+            view: 'circle-contacts::contacts.edit',
+            hasMedia: true,
+            collection: [
+                'avatar' => false,
+            ]
+        );
+    }
+
+    /**
+     * @param CircleXoContactUpdateRequest $request
+     * @param \Modules\CircleContacts\App\Models\CircleXoContact $model
+     * @return RedirectResponse|JsonResponse
+     */
+    public function update(CircleXoContactUpdateRequest $request, \Modules\CircleContacts\App\Models\CircleXoContact $model): RedirectResponse|JsonResponse
+    {
+        $response = Tomato::update(
+            request: $request,
+            model: $model,
+            message: __('Contact updated successfully'),
+            redirect: 'profile.contacts.index',
+            hasMedia: true,
+            collection: [
+                'avatar' => false,
+            ]
+        );
+
+        $response->record->groups()->sync($request->get('groups'));
+
+        if($response instanceof JsonResponse){
+             return $response;
+         }
+
+         return back();
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Models\CircleXoContact $model
+     * @return RedirectResponse|JsonResponse
+     */
+    public function destroy(\Modules\CircleContacts\App\Models\CircleXoContact $model): RedirectResponse|JsonResponse
+    {
+        if(!has_app('circle-contacts', $model->account_id)){
+            abort(403);
+        }
+
+        $model->groups()->detach();
+        $model->contactMeta()->delete();
+        $response = Tomato::destroy(
+            model: $model,
+            message: __('Contact deleted successfully'),
+            redirect: 'profile.contacts.index',
+            hasMedia: true,
+            collection: [
+                'avatar' => false,
+            ]
+        );
+
+        if($response instanceof JsonResponse){
+            return $response;
+        }
+
+        return redirect()->route('profile.contacts.index');
+    }
+}
diff --git a/Modules/CircleContacts/App/Http/Controllers/CircleXoContactsGroupController.php b/Modules/CircleContacts/App/Http/Controllers/CircleXoContactsGroupController.php
new file mode 100644
index 0000000..8a1f723
--- /dev/null
+++ b/Modules/CircleContacts/App/Http/Controllers/CircleXoContactsGroupController.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Modules\CircleContacts\App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+use TomatoPHP\TomatoAdmin\Facade\Tomato;
+
+class CircleXoContactsGroupController extends Controller
+{
+    public string $model;
+
+    public function __construct()
+    {
+        $this->model = \Modules\CircleContacts\App\Models\CircleXoContactsGroup::class;
+    }
+
+    /**
+     * @param Request $request
+     * @return View|JsonResponse
+     */
+    public function index(Request $request): View|JsonResponse
+    {
+        return Tomato::index(
+            request: $request,
+            model: $this->model,
+            view: 'circle-contacts::groups.index',
+            table: \Modules\CircleContacts\App\Tables\CircleXoContactsGroupTable::class
+        );
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function api(Request $request): JsonResponse
+    {
+        return Tomato::json(
+            request: $request,
+            model: \Modules\CircleContacts\App\Models\CircleXoContactsGroup::class,
+        );
+    }
+
+    /**
+     * @return View
+     */
+    public function create(): View
+    {
+        return Tomato::create(
+            view: 'circle-contacts::groups.create',
+        );
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Http\Requests\CircleXoContactsGroup\CircleXoContactsGroupStoreRequest $request
+     * @return RedirectResponse|JsonResponse
+     */
+    public function store(\Modules\CircleContacts\App\Http\Requests\CircleXoContactsGroup\CircleXoContactsGroupStoreRequest $request): RedirectResponse|JsonResponse
+    {
+        $request->merge([
+            "account_id" => auth('accounts')->user()->id
+        ]);
+
+        $response = Tomato::store(
+            request: $request,
+            model: \Modules\CircleContacts\App\Models\CircleXoContactsGroup::class,
+            message: __('Group saved successfully'),
+            redirect: 'profile.groups.index',
+        );
+
+        if($response instanceof JsonResponse){
+            return $response;
+        }
+
+        return back();
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Models\CircleXoContactsGroup $model
+     * @return View|JsonResponse
+     */
+    public function show(\Modules\CircleContacts\App\Models\CircleXoContactsGroup $model): View|JsonResponse
+    {
+        return Tomato::get(
+            model: $model,
+            view: 'circle-contacts::groups.show',
+        );
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Models\CircleXoContactsGroup $model
+     * @return View
+     */
+    public function edit(\Modules\CircleContacts\App\Models\CircleXoContactsGroup $model): View
+    {
+        return Tomato::get(
+            model: $model,
+            view: 'circle-contacts::groups.edit',
+        );
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Http\Requests\CircleXoContactsGroup\CircleXoContactsGroupUpdateRequest $request
+     * @param \Modules\CircleContacts\App\Models\CircleXoContactsGroup $model
+     * @return RedirectResponse|JsonResponse
+     */
+    public function update(\Modules\CircleContacts\App\Http\Requests\CircleXoContactsGroup\CircleXoContactsGroupUpdateRequest $request, \Modules\CircleContacts\App\Models\CircleXoContactsGroup $model): RedirectResponse|JsonResponse
+    {
+        $response = Tomato::update(
+            request: $request,
+            model: $model,
+            message: __('Group updated successfully'),
+            redirect: 'profile.groups.index',
+        );
+
+         if($response instanceof JsonResponse){
+             return $response;
+         }
+
+         return back();
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Models\CircleXoContactsGroup $model
+     * @return RedirectResponse|JsonResponse
+     */
+    public function destroy(\Modules\CircleContacts\App\Models\CircleXoContactsGroup $model): RedirectResponse|JsonResponse
+    {
+        $response = Tomato::destroy(
+            model: $model,
+            message: __('Group deleted successfully'),
+            redirect: 'profile.groups.index',
+        );
+
+        if($response instanceof JsonResponse){
+            return $response;
+        }
+
+        return redirect()->route('profile.contacts.index');
+    }
+}
diff --git a/Modules/CircleContacts/App/Http/Controllers/CircleXoContactsMetaController.php b/Modules/CircleContacts/App/Http/Controllers/CircleXoContactsMetaController.php
new file mode 100644
index 0000000..41c0968
--- /dev/null
+++ b/Modules/CircleContacts/App/Http/Controllers/CircleXoContactsMetaController.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Modules\CircleContacts\App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+use Modules\CircleContacts\App\Models\CircleXoContact;
+use TomatoPHP\TomatoAdmin\Facade\Tomato;
+
+class CircleXoContactsMetaController extends Controller
+{
+    public string $model;
+
+    public function __construct()
+    {
+        $this->model = \Modules\CircleContacts\App\Models\CircleXoContactsMeta::class;
+    }
+
+    /**
+     * @return View
+     */
+    public function create(CircleXoContact $account): View
+    {
+        if(!has_app('circle-contacts', $account->id)){
+            abort(403);
+        }
+
+        return Tomato::create(
+            view: 'circle-contacts::contacts.meta.create',
+            data: [
+                'account' => $account,
+            ]
+        );
+    }
+
+    /**
+     * @param Request $request
+     * @return RedirectResponse|JsonResponse
+     */
+    public function store(Request $request, CircleXoContact $account): RedirectResponse|JsonResponse
+    {
+        if(!has_app('circle-contacts', $account->id)){
+            abort(403);
+        }
+
+        $request->merge([
+            'contact_id' => $account->id,
+        ]);
+
+        $response = Tomato::store(
+            request: $request,
+            model: \Modules\CircleContacts\App\Models\CircleXoContactsMeta::class,
+            validation: [
+                'key' => 'required|max:255|string',
+                'value' => 'nullable',
+            ],
+            message: __('Details saved successfully'),
+            redirect: 'profile.contacts.index',
+        );
+
+        if($response instanceof JsonResponse){
+            return $response;
+        }
+
+        return back();
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Models\CircleXoContactsMeta $model
+     * @return View
+     */
+    public function edit(CircleXoContact $account, \Modules\CircleContacts\App\Models\CircleXoContactsMeta $model): View
+    {
+        if(!has_app('circle-contacts', $account->id)){
+            abort(403);
+        }
+        return Tomato::get(
+            model: $model,
+            view: 'circle-contacts::contacts.meta.edit',
+            data: [
+                'account' => $account,
+            ]
+        );
+    }
+
+    /**
+     * @param Request $request
+     * @param \Modules\CircleContacts\App\Models\CircleXoContactsMeta $model
+     * @return RedirectResponse|JsonResponse
+     */
+    public function update(CircleXoContact $account, Request $request, \Modules\CircleContacts\App\Models\CircleXoContactsMeta $model): RedirectResponse|JsonResponse
+    {
+        if(!has_app('circle-contacts', $account->id)){
+            abort(403);
+        }
+
+        $response = Tomato::update(
+            request: $request,
+            model: $model,
+            validation: [
+                'key' => 'sometimes|max:255|string',
+                'value' => 'nullable',
+            ],
+            message: __('Details updated successfully'),
+            redirect: 'profile.contacts.index',
+        );
+
+         if($response instanceof JsonResponse){
+             return $response;
+         }
+
+         return back();
+    }
+
+    /**
+     * @param \Modules\CircleContacts\App\Models\CircleXoContactsMeta $model
+     * @return RedirectResponse|JsonResponse
+     */
+    public function destroy(CircleXoContact $account, \Modules\CircleContacts\App\Models\CircleXoContactsMeta $model): RedirectResponse|JsonResponse
+    {
+        if(!has_app('circle-contacts', $account->id)){
+            abort(403);
+        }
+
+        $response = Tomato::destroy(
+            model: $model,
+            message: __('Details deleted successfully'),
+            redirect: 'profile.contacts.index',
+        );
+
+        if($response instanceof JsonResponse){
+            return $response;
+        }
+
+        return back();
+    }
+}
diff --git a/Modules/CircleContacts/App/Http/Requests/.gitkeep b/Modules/CircleContacts/App/Http/Requests/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Http/Requests/CircleXoContact/.gitkeep b/Modules/CircleContacts/App/Http/Requests/CircleXoContact/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Http/Requests/CircleXoContact/CircleXoContactStoreRequest.php b/Modules/CircleContacts/App/Http/Requests/CircleXoContact/CircleXoContactStoreRequest.php
new file mode 100644
index 0000000..b4bfeb4
--- /dev/null
+++ b/Modules/CircleContacts/App/Http/Requests/CircleXoContact/CircleXoContactStoreRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Modules\CircleContacts\App\Http\Requests\CircleXoContact;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CircleXoContactStoreRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return has_app('circle-contacts');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, mixed>
+     */
+    public function rules()
+    {
+        return [
+            'avatar' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,webp|max:2048',
+            'name' => 'required|max:255|string',
+            'email' => 'nullable|max:255|string|email',
+            'phone' => 'required|max:255|string|min:12',
+            'address' => 'nullable',
+            'company' => 'nullable|max:255|string'
+        ];
+    }
+}
diff --git a/Modules/CircleContacts/App/Http/Requests/CircleXoContact/CircleXoContactUpdateRequest.php b/Modules/CircleContacts/App/Http/Requests/CircleXoContact/CircleXoContactUpdateRequest.php
new file mode 100644
index 0000000..4a4bbc7
--- /dev/null
+++ b/Modules/CircleContacts/App/Http/Requests/CircleXoContact/CircleXoContactUpdateRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Modules\CircleContacts\App\Http\Requests\CircleXoContact;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Modules\CircleContacts\App\Models\CircleXoContact;
+
+class CircleXoContactUpdateRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return has_app('circle-contacts', $this->model['account_id']);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, mixed>
+     */
+    public function rules()
+    {
+        return [
+            'avatar' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,webp|max:2048',
+            'email' => 'nullable|max:255|string|email',
+            'phone' => 'sometimes|max:255|string|min:12',
+            'address' => 'nullable',
+            'company' => 'nullable|max:255|string'
+        ];
+    }
+}
diff --git a/Modules/CircleContacts/App/Http/Requests/CircleXoContactsGroup/.gitkeep b/Modules/CircleContacts/App/Http/Requests/CircleXoContactsGroup/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Http/Requests/CircleXoContactsGroup/CircleXoContactsGroupStoreRequest.php b/Modules/CircleContacts/App/Http/Requests/CircleXoContactsGroup/CircleXoContactsGroupStoreRequest.php
new file mode 100644
index 0000000..506b883
--- /dev/null
+++ b/Modules/CircleContacts/App/Http/Requests/CircleXoContactsGroup/CircleXoContactsGroupStoreRequest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\CircleContacts\App\Http\Requests\CircleXoContactsGroup;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CircleXoContactsGroupStoreRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, mixed>
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|max:255|string',
+            'description' => 'required',
+            'icon' => 'nullable|max:255|string',
+            'color' => 'nullable|max:255|string'
+        ];
+    }
+}
diff --git a/Modules/CircleContacts/App/Http/Requests/CircleXoContactsGroup/CircleXoContactsGroupUpdateRequest.php b/Modules/CircleContacts/App/Http/Requests/CircleXoContactsGroup/CircleXoContactsGroupUpdateRequest.php
new file mode 100644
index 0000000..2f4fe97
--- /dev/null
+++ b/Modules/CircleContacts/App/Http/Requests/CircleXoContactsGroup/CircleXoContactsGroupUpdateRequest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\CircleContacts\App\Http\Requests\CircleXoContactsGroup;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CircleXoContactsGroupUpdateRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, mixed>
+     */
+    public function rules()
+    {
+        return [
+                        'name' => 'sometimes|max:255|string',
+            'description' => 'sometimes',
+            'icon' => 'nullable|max:255|string',
+            'color' => 'nullable|max:255|string'
+        ];
+    }
+}
diff --git a/Modules/CircleContacts/App/Http/Requests/CircleXoContactsMeta/.gitkeep b/Modules/CircleContacts/App/Http/Requests/CircleXoContactsMeta/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Models/.gitkeep b/Modules/CircleContacts/App/Models/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Models/CircleXoContact.php b/Modules/CircleContacts/App/Models/CircleXoContact.php
new file mode 100644
index 0000000..023c3e3
--- /dev/null
+++ b/Modules/CircleContacts/App/Models/CircleXoContact.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Modules\CircleContacts\App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
+
+/**
+ * @property string $id
+* @property string $name
+* @property string $email
+* @property string $phone
+* @property string $address
+* @property string $company
+* @property string $type
+* @property \App\Models\Account $account_id
+ */
+class CircleXoContact extends Model implements HasMedia
+{
+    use InteractsWithMedia;
+    /**
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'name',
+        'email',
+        'phone',
+        'address',
+        'company',
+        'type',
+        'account_id'
+    ];
+
+    public function account()
+    {
+        return $this->belongsTo(\App\Models\Account::class);
+    }
+
+    public function groups()
+    {
+        return $this->belongsToMany('Modules\CircleContacts\App\Models\CircleXoContactsGroup', 'circle_xo_contacts_has_groups', 'contact_id', 'group_id');
+    }
+
+    public function contactMeta()
+    {
+        return $this->hasMany('Modules\CircleContacts\App\Models\CircleXoContactsMeta', 'contact_id', 'id');
+    }
+}
diff --git a/Modules/CircleContacts/App/Models/CircleXoContactsGroup.php b/Modules/CircleContacts/App/Models/CircleXoContactsGroup.php
new file mode 100644
index 0000000..60cd1cb
--- /dev/null
+++ b/Modules/CircleContacts/App/Models/CircleXoContactsGroup.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\CircleContacts\App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property string $id
+* @property \App\Models\Account $account_id
+* @property string $name
+* @property string $description
+* @property string $icon
+* @property string $color
+ */
+class CircleXoContactsGroup extends Model
+{
+    /**
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'account_id',
+        'name',
+        'description',
+        'icon',
+        'color'
+    ];
+
+    public function account()
+    {
+        return $this->belongsTo(\App\Models\Account::class);
+    }
+}
diff --git a/Modules/CircleContacts/App/Models/CircleXoContactsMeta.php b/Modules/CircleContacts/App/Models/CircleXoContactsMeta.php
new file mode 100644
index 0000000..c78cdf4
--- /dev/null
+++ b/Modules/CircleContacts/App/Models/CircleXoContactsMeta.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Modules\CircleContacts\App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property string $id
+* @property string $key
+* @property string $value
+* @property \Modules\CircleContacts\App\Models\CircleXoContact $contact_id
+ */
+class CircleXoContactsMeta extends Model
+{
+    /**
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'key',
+        'value',
+        'contact_id'
+    ];
+
+    protected $casts = [
+        'value' => 'json'
+    ];
+
+
+
+    public function contact()
+    {
+        return $this->belongsTo(\Modules\CircleContacts\App\Models\CircleXoContact::class);
+    }
+}
diff --git a/Modules/CircleContacts/App/Providers/.gitkeep b/Modules/CircleContacts/App/Providers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Providers/CircleContactsServiceProvider.php b/Modules/CircleContacts/App/Providers/CircleContactsServiceProvider.php
new file mode 100644
index 0000000..6ace35f
--- /dev/null
+++ b/Modules/CircleContacts/App/Providers/CircleContactsServiceProvider.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace Modules\CircleContacts\App\Providers;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
+use Modules\CircleApps\App\Facades\CircleAppsMenu;
+use TomatoPHP\TomatoAdmin\Services\Contracts\Menu;
+
+class CircleContactsServiceProvider extends ServiceProvider
+{
+    protected string $moduleName = 'CircleContacts';
+
+    protected string $moduleNameLower = 'circle-contacts';
+
+    /**
+     * Boot the application events.
+     */
+    public function boot(): void
+    {
+        $this->registerCommands();
+        $this->registerCommandSchedules();
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+        $this->loadMigrationsFrom(module_path($this->moduleName, 'Database/migrations'));
+
+
+        CircleAppsMenu::register([
+            Menu::make()
+                ->group('circle-contacts')
+                ->label(__('Contacts'))
+                ->icon('bx bxs-group')
+                ->route('profile.contacts.index')
+        ]);
+    }
+
+    /**
+     * Register the service provider.
+     */
+    public function register(): void
+    {
+        $this->app->register(RouteServiceProvider::class);
+    }
+
+    /**
+     * Register commands in the format of Command::class
+     */
+    protected function registerCommands(): void
+    {
+        // $this->commands([]);
+    }
+
+    /**
+     * Register command Schedules.
+     */
+    protected function registerCommandSchedules(): void
+    {
+        // $this->app->booted(function () {
+        //     $schedule = $this->app->make(Schedule::class);
+        //     $schedule->command('inspire')->hourly();
+        // });
+    }
+
+    /**
+     * Register translations.
+     */
+    public function registerTranslations(): void
+    {
+        $langPath = resource_path('lang/modules/'.$this->moduleNameLower);
+
+        if (is_dir($langPath)) {
+            $this->loadTranslationsFrom($langPath, $this->moduleNameLower);
+            $this->loadJsonTranslationsFrom($langPath);
+        } else {
+            $this->loadTranslationsFrom(module_path($this->moduleName, 'lang'), $this->moduleNameLower);
+            $this->loadJsonTranslationsFrom(module_path($this->moduleName, 'lang'));
+        }
+    }
+
+    /**
+     * Register config.
+     */
+    protected function registerConfig(): void
+    {
+        $this->publishes([module_path($this->moduleName, 'config/config.php') => config_path($this->moduleNameLower.'.php')], 'config');
+        $this->mergeConfigFrom(module_path($this->moduleName, 'config/config.php'), $this->moduleNameLower);
+    }
+
+    /**
+     * Register views.
+     */
+    public function registerViews(): void
+    {
+        $viewPath = resource_path('views/modules/'.$this->moduleNameLower);
+        $sourcePath = module_path($this->moduleName, 'resources/views');
+
+        $this->publishes([$sourcePath => $viewPath], ['views', $this->moduleNameLower.'-module-views']);
+
+        $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower);
+
+        $componentNamespace = str_replace('/', '\\', config('modules.namespace').'\\'.$this->moduleName.'\\'.config('modules.paths.generator.component-class.path'));
+        Blade::componentNamespace($componentNamespace, $this->moduleNameLower);
+    }
+
+    /**
+     * Get the services provided by the provider.
+     */
+    public function provides(): array
+    {
+        return [];
+    }
+
+    private function getPublishableViewPaths(): array
+    {
+        $paths = [];
+        foreach (config('view.paths') as $path) {
+            if (is_dir($path.'/modules/'.$this->moduleNameLower)) {
+                $paths[] = $path.'/modules/'.$this->moduleNameLower;
+            }
+        }
+
+        return $paths;
+    }
+}
diff --git a/Modules/CircleContacts/App/Providers/RouteServiceProvider.php b/Modules/CircleContacts/App/Providers/RouteServiceProvider.php
new file mode 100644
index 0000000..2fb83f7
--- /dev/null
+++ b/Modules/CircleContacts/App/Providers/RouteServiceProvider.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Modules\CircleContacts\App\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * The module namespace to assume when generating URLs to actions.
+     */
+    protected string $moduleNamespace = 'Modules\CircleContacts\App\Http\Controllers';
+
+    /**
+     * Called before routes are registered.
+     *
+     * Register any model bindings or pattern based filters.
+     */
+    public function boot(): void
+    {
+        parent::boot();
+    }
+
+    /**
+     * Define the routes for the application.
+     */
+    public function map(): void
+    {
+        $this->mapApiRoutes();
+
+        $this->mapWebRoutes();
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     */
+    protected function mapWebRoutes(): void
+    {
+        Route::middleware('web')
+            ->namespace($this->moduleNamespace)
+            ->group(module_path('CircleContacts', '/routes/web.php'));
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     */
+    protected function mapApiRoutes(): void
+    {
+        Route::prefix('api')
+            ->middleware('api')
+            ->namespace($this->moduleNamespace)
+            ->group(module_path('CircleContacts', '/routes/api.php'));
+    }
+}
diff --git a/Modules/CircleContacts/App/Tables/.gitkeep b/Modules/CircleContacts/App/Tables/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/App/Tables/CircleXoContactTable.php b/Modules/CircleContacts/App/Tables/CircleXoContactTable.php
new file mode 100644
index 0000000..23ddb14
--- /dev/null
+++ b/Modules/CircleContacts/App/Tables/CircleXoContactTable.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Modules\CircleContacts\App\Tables;
+
+use Illuminate\Http\Request;
+use ProtoneMedia\Splade\AbstractTable;
+use ProtoneMedia\Splade\Facades\Toast;
+use ProtoneMedia\Splade\SpladeTable;
+use Illuminate\Database\Eloquent\Builder;
+
+class CircleXoContactTable extends AbstractTable
+{
+    /**
+     * Create a new instance.
+     *
+     * @return void
+     */
+    public function __construct(public $query=null)
+    {
+        if(!$query){
+            $this->query = \Modules\CircleContacts\App\Models\CircleXoContact::query();
+        }
+    }
+
+    /**
+     * Determine if the user is authorized to perform bulk actions and exports.
+     *
+     * @return bool
+     */
+    public function authorize(Request $request)
+    {
+        return true;
+    }
+
+    /**
+     * The resource or query builder.
+     *
+     * @return mixed
+     */
+    public function for()
+    {
+        return $this->query;
+    }
+
+    /**
+     * Configure the given SpladeTable.
+     *
+     * @param \ProtoneMedia\Splade\SpladeTable $table
+     * @return void
+     */
+    public function configure(SpladeTable $table)
+    {
+        $table
+            ->withGlobalSearch(
+                label: trans('tomato-admin::global.search'),
+                columns: ['id','name','email','phone']
+            )
+            ->bulkAction(
+                label: trans('tomato-admin::global.crud.delete'),
+                each: function(\Modules\CircleContacts\App\Models\CircleXoContact $model){
+                    $model->contactMeta()->delete();
+                    $model->groups()->detach();
+                    $model->delete();
+                },
+                after: fn () => Toast::danger(__('Contact Has Been Deleted'))->autoDismiss(2),
+                confirm: true
+            )
+            ->defaultSort('id', 'desc')
+            ->column(
+                key: 'id',
+                label: __('Id'),
+                canBeHidden: false,
+                sortable: true,
+
+            )
+            ->column(
+                key: 'name',
+                label: __('Name'),
+                canBeHidden: false,
+                sortable: true,
+            )
+            ->column(
+                key: 'email',
+                label: __('Email'),
+                canBeHidden: false,
+                sortable: true
+            )
+            ->column(
+                key: 'phone',
+                label: __('Phone'),
+                canBeHidden: false,
+                sortable: true
+            )
+            ->column(
+                key: 'address',
+                label: __('Address'),
+                canBeHidden: false,
+                sortable: true
+            )
+            ->column(
+                key: 'company',
+                label: __('Company'),
+                canBeHidden: false,
+                sortable: true
+            )
+            ->column(
+                key: 'type',
+                label: __('Type'),
+                canBeHidden: false,
+                sortable: true
+            )
+            ->export()
+            ->paginate(8);
+    }
+}
diff --git a/Modules/CircleContacts/App/Tables/CircleXoContactsGroupTable.php b/Modules/CircleContacts/App/Tables/CircleXoContactsGroupTable.php
new file mode 100644
index 0000000..91563e5
--- /dev/null
+++ b/Modules/CircleContacts/App/Tables/CircleXoContactsGroupTable.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Modules\CircleContacts\App\Tables;
+
+use Illuminate\Http\Request;
+use ProtoneMedia\Splade\AbstractTable;
+use ProtoneMedia\Splade\Facades\Toast;
+use ProtoneMedia\Splade\SpladeTable;
+use Illuminate\Database\Eloquent\Builder;
+
+class CircleXoContactsGroupTable extends AbstractTable
+{
+    /**
+     * Create a new instance.
+     *
+     * @return void
+     */
+    public function __construct(public $query=null)
+    {
+        if(!$query){
+            $this->query = \Modules\CircleContacts\App\Models\CircleXoContactsGroup::query();
+        }
+    }
+
+    /**
+     * Determine if the user is authorized to perform bulk actions and exports.
+     *
+     * @return bool
+     */
+    public function authorize(Request $request)
+    {
+        return true;
+    }
+
+    /**
+     * The resource or query builder.
+     *
+     * @return mixed
+     */
+    public function for()
+    {
+        return $this->query;
+    }
+
+    /**
+     * Configure the given SpladeTable.
+     *
+     * @param \ProtoneMedia\Splade\SpladeTable $table
+     * @return void
+     */
+    public function configure(SpladeTable $table)
+    {
+        $table
+            ->withGlobalSearch(
+                label: trans('tomato-admin::global.search'),
+                columns: ['id','name',]
+            )
+            ->bulkAction(
+                label: trans('tomato-admin::global.crud.delete'),
+                each: fn (\Modules\CircleContacts\App\Models\CircleXoContactsGroup $model) => $model->delete(),
+                after: fn () => Toast::danger(__('CircleXoContactsGroup Has Been Deleted'))->autoDismiss(2),
+                confirm: true
+            )
+            ->defaultSort('id', 'desc')
+            ->column(
+                key: 'id',
+                label: __('Id'),
+                sortable: true
+            )
+            ->column(
+                key: 'name',
+                label: __('Name'),
+                sortable: true
+            )
+            ->column(
+                key: 'description',
+                label: __('Description'),
+                sortable: true
+            )
+            ->column(
+                key: 'icon',
+                label: __('Icon'),
+                sortable: true
+            )
+            ->column(
+                key: 'color',
+                label: __('Color'),
+                sortable: true
+            )
+            ->column(key: 'actions',label: trans('tomato-admin::global.crud.actions'))
+            ->export()
+            ->paginate(10);
+    }
+}
diff --git a/Modules/CircleContacts/App/resources/.gitkeep b/Modules/CircleContacts/App/resources/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/CHANGELOG.md b/Modules/CircleContacts/CHANGELOG.md
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/Database/Seeders/.gitkeep b/Modules/CircleContacts/Database/Seeders/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/Database/Seeders/CircleContactsDatabaseSeeder.php b/Modules/CircleContacts/Database/Seeders/CircleContactsDatabaseSeeder.php
new file mode 100644
index 0000000..0f35710
--- /dev/null
+++ b/Modules/CircleContacts/Database/Seeders/CircleContactsDatabaseSeeder.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\CircleContacts\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+
+class CircleContactsDatabaseSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        // $this->call([]);
+    }
+}
diff --git a/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3232_create_circle_xo_contacts_table.php b/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3232_create_circle_xo_contacts_table.php
new file mode 100644
index 0000000..1006687
--- /dev/null
+++ b/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3232_create_circle_xo_contacts_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('circle_xo_contacts', function (Blueprint $table) {
+            $table->id();
+            $table->string("name")->index();
+            $table->string("email")->nullable();
+            $table->string("phone")->unique()->index();
+            $table->text("address")->nullable();
+            $table->string("company")->nullable();
+            $table->string("type")->default('customer')->nullable();
+            $table->foreignId("account_id")->references('id')->on('accounts')->onDelete('cascade');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('circle_xo_contacts');
+    }
+};
diff --git a/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3535_create_circle_xo_contacts_metas_table.php b/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3535_create_circle_xo_contacts_metas_table.php
new file mode 100644
index 0000000..9ba3cad
--- /dev/null
+++ b/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3535_create_circle_xo_contacts_metas_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('circle_xo_contacts_metas', function (Blueprint $table) {
+            $table->id();
+            $table->string("key")->index();
+            $table->json("value")->nullable();
+            $table->foreignId("contact_id")->references('id')->on('circle_xo_contacts')->onDelete('cascade');
+            $table->timestamps();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('circle_xo_contacts_metas');
+    }
+};
diff --git a/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3737_create_circle_xo_contacts_groups_table.php b/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3737_create_circle_xo_contacts_groups_table.php
new file mode 100644
index 0000000..2d22756
--- /dev/null
+++ b/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3737_create_circle_xo_contacts_groups_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('circle_xo_contacts_groups', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId("account_id")->references('id')->on('accounts')->onDelete('cascade');
+            $table->string("name")->unique()->index();
+            $table->text("description");
+            $table->string("icon")->nullable();
+            $table->string("color")->nullable();
+            $table->timestamps();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('circle_xo_contacts_groups');
+    }
+};
diff --git a/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3939_create_circle_xo_contacts_has_groups_table.php b/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3939_create_circle_xo_contacts_has_groups_table.php
new file mode 100644
index 0000000..8add261
--- /dev/null
+++ b/Modules/CircleContacts/Database/migrations/2024_03_30_06_0303_3939_create_circle_xo_contacts_has_groups_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('circle_xo_contacts_has_groups', function (Blueprint $table) {
+            $table->foreignId("contact_id")->references('id')->on('circle_xo_contacts')->primary();
+            $table->foreignId("group_id")->references('id')->on('circle_xo_contacts_groups');
+            $table->timestamps();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('circle_xo_contacts_has_groups');
+    }
+};
diff --git a/Modules/CircleContacts/LICENSE.md b/Modules/CircleContacts/LICENSE.md
new file mode 100644
index 0000000..a77082f
--- /dev/null
+++ b/Modules/CircleContacts/LICENSE.md
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Fady Mondy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Modules/CircleContacts/README.md b/Modules/CircleContacts/README.md
new file mode 100644
index 0000000..b51ec36
--- /dev/null
+++ b/Modules/CircleContacts/README.md
@@ -0,0 +1,29 @@
+# Circle Contacts
+
+Manage your contacts and customers from your profile
+
+## Installation
+
+```bash
+composer require tomatophp/CircleContacts
+```
+
+## Support
+
+you can join our discord server to get support [TomatoPHP](https://discord.gg/Xqmt35Uh)
+
+## Docs
+
+you can check docs of this package on [Docs](https://docs.tomatophp.com/plugins/tomato-themes)
+
+## Changelog
+
+Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.
+
+## Security
+
+Please see [SECURITY](SECURITY.md) for more information about security.
+
+## License
+
+The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
diff --git a/Modules/CircleContacts/SECURITY.md b/Modules/CircleContacts/SECURITY.md
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/composer.json b/Modules/CircleContacts/composer.json
new file mode 100644
index 0000000..e2d0915
--- /dev/null
+++ b/Modules/CircleContacts/composer.json
@@ -0,0 +1,31 @@
+{
+    "name": "nwidart/circlecontacts",
+    "description": "",
+    "authors": [
+        {
+            "name": "Nicolas Widart",
+            "email": "n.widart@gmail.com"
+        }
+    ],
+    "extra": {
+        "laravel": {
+            "providers": [],
+            "aliases": {
+
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Modules\\CircleContacts\\": "",
+            "Modules\\CircleContacts\\App\\": "app/",
+            "Modules\\CircleContacts\\Database\\Factories\\": "database/factories/",
+            "Modules\\CircleContacts\\Database\\Seeders\\": "database/seeders/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Modules\\CircleContacts\\Tests\\": "tests/"
+        }
+    }
+}
diff --git a/Modules/CircleContacts/config/.gitkeep b/Modules/CircleContacts/config/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/config/config.php b/Modules/CircleContacts/config/config.php
new file mode 100644
index 0000000..007053d
--- /dev/null
+++ b/Modules/CircleContacts/config/config.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'name' => 'CircleContacts',
+];
diff --git a/Modules/CircleContacts/module.json b/Modules/CircleContacts/module.json
new file mode 100644
index 0000000..ebfe8ac
--- /dev/null
+++ b/Modules/CircleContacts/module.json
@@ -0,0 +1,27 @@
+{
+    "name": "CircleContacts",
+    "alias": "circle-contacts",
+    "description": {
+        "ar": "Manage your contacts and customers from your profile",
+        "en": "Manage your contacts and customers from your profile",
+        "gr": "Manage your contacts and customers from your profile",
+        "sp": "Manage your contacts and customers from your profile"
+    },
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+        "Modules\\CircleContacts\\App\\Providers\\CircleContactsServiceProvider"
+    ],
+    "files": [],
+    "title": {
+        "ar": "Circle Contacts",
+        "en": "Circle Contacts",
+        "gr": "Circle Contacts",
+        "sp": "Circle Contacts"
+    },
+    "color": "#E84B3C",
+    "icon": "bx bxs-user",
+    "placeholder": "placeholder.webp",
+    "type": "plugin",
+    "version": "v1.0"
+}
diff --git a/Modules/CircleContacts/package.json b/Modules/CircleContacts/package.json
new file mode 100644
index 0000000..d6fbfc8
--- /dev/null
+++ b/Modules/CircleContacts/package.json
@@ -0,0 +1,15 @@
+{
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "axios": "^1.1.2",
+    "laravel-vite-plugin": "^0.7.5",
+    "sass": "^1.69.5",
+    "postcss": "^8.3.7",
+    "vite": "^4.0.0"
+  }
+}
diff --git a/Modules/CircleContacts/resources/assets/js/app.js b/Modules/CircleContacts/resources/assets/js/app.js
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/resources/assets/sass/app.scss b/Modules/CircleContacts/resources/assets/sass/app.scss
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/resources/views/.gitkeep b/Modules/CircleContacts/resources/views/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/resources/views/circle-xo-contacts-groups/.gitkeep b/Modules/CircleContacts/resources/views/circle-xo-contacts-groups/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/resources/views/contacts/.gitkeep b/Modules/CircleContacts/resources/views/contacts/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/resources/views/contacts/create.blade.php b/Modules/CircleContacts/resources/views/contacts/create.blade.php
new file mode 100644
index 0000000..c891d82
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/contacts/create.blade.php
@@ -0,0 +1,29 @@
+<x-splade-modal>
+    <x-slot:title>
+        {{__('New Contact')}}
+    </x-slot:title>
+    <x-splade-form class="flex flex-col space-y-4" action="{{route('profile.contacts.store')}}" method="post">
+        @php $groups = \Modules\CircleContacts\App\Models\CircleXoContactsGroup::all() @endphp
+        <x-splade-select choices="{allowHTML: true}" multiple :label="__('Groups')" name="groups" option-label="name" option-value="id" :placeholder="__('Groups')">
+            @foreach($groups as $group)
+                <option value="{{$group->id}}" >
+                    <i class="{{$group->icon}} text-sm"></i>
+                    {{$group->name}}
+                </option>
+            @endforeach
+        </x-splade-select>
+        <x-splade-file preview filepond name="avatar" :label="__('Avatar')" />
+
+        <x-splade-input :label="__('Name')" name="name" type="text"  :placeholder="__('Name')" />
+        <x-splade-input :label="__('Email')" name="email" type="email"  :placeholder="__('Email')" />
+        <x-splade-input :label="__('Phone')" name="phone" type="tel"  :placeholder="__('Phone')" />
+        <x-splade-textarea :label="__('Address')" name="address" :placeholder="__('Address')" autosize />
+        <x-splade-input :label="__('Company')" name="company" type="text"  :placeholder="__('Company')" />
+
+
+        <div class="flex justify-start gap-2 pt-3">
+            <x-tomato-admin-submit  label="{{__('Save')}}" :spinner="true" />
+            <x-tomato-admin-button secondary type="button" @click.prevent="modal.close" label="{{__('Cancel')}}"/>
+        </div>
+    </x-splade-form>
+</x-splade-modal>
diff --git a/Modules/CircleContacts/resources/views/contacts/edit.blade.php b/Modules/CircleContacts/resources/views/contacts/edit.blade.php
new file mode 100644
index 0000000..c8db24f
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/contacts/edit.blade.php
@@ -0,0 +1,34 @@
+<x-splade-modal>
+    <x-slot:title>
+        {{__('Edit Contact')}} #{{$model->id}}
+    </x-slot:title>
+    <x-splade-form class="flex flex-col space-y-4" action="{{route('profile.contacts.update', $model->id)}}" method="post" :default="$model">
+        @php $groups = \Modules\CircleContacts\App\Models\CircleXoContactsGroup::all() @endphp
+        <x-splade-select choices="{allowHTML: true}" multiple :label="__('Groups')" name="groups" option-label="name" option-value="id" :placeholder="__('Groups')">
+            @foreach($groups as $group)
+                <option value="{{$group->id}}" >
+                    <i class="{{$group->icon}} text-sm"></i>
+                    {{$group->name}}
+                </option>
+            @endforeach
+        </x-splade-select>
+        <x-splade-file preview filepond name="avatar" :label="__('Avatar')" />
+
+        <x-splade-input :label="__('Name')" name="name" type="text"  :placeholder="__('Name')" />
+        <x-splade-input :label="__('Email')" name="email" type="email"  :placeholder="__('Email')" />
+        <x-splade-input :label="__('Phone')" name="phone" type="tel"  :placeholder="__('Phone')" />
+        <x-splade-textarea :label="__('Address')" name="address" :placeholder="__('Address')" autosize />
+        <x-splade-input :label="__('Company')" name="company" type="text"  :placeholder="__('Company')" />
+
+        <div class="flex justify-start gap-2 pt-3">
+            <x-tomato-admin-submit  label="{{__('Save')}}" :spinner="true" />
+            <x-tomato-admin-button danger :href="route('profile.contacts.destroy', $model->id)"
+                                   confirm="{{trans('tomato-admin::global.crud.delete-confirm')}}"
+                                   confirm-text="{{trans('tomato-admin::global.crud.delete-confirm-text')}}"
+                                   confirm-button="{{trans('tomato-admin::global.crud.delete-confirm-button')}}"
+                                   cancel-button="{{trans('tomato-admin::global.crud.delete-confirm-cancel-button')}}"
+                                   method="delete"  label="{{__('Delete')}}" />
+            <x-tomato-admin-button secondary type="button" @click.prevent="modal.close" label="{{__('Cancel')}}"/>
+        </div>
+    </x-splade-form>
+</x-splade-modal>
diff --git a/Modules/CircleContacts/resources/views/contacts/index.blade.php b/Modules/CircleContacts/resources/views/contacts/index.blade.php
new file mode 100644
index 0000000..75be1c3
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/contacts/index.blade.php
@@ -0,0 +1,67 @@
+@extends('circle-contacts::layout.contact')
+
+@section('content')
+    @if(\Modules\CircleContacts\App\Models\CircleXoContactsGroup::query()->count() < 0)
+        <div class="bg-zinc-800 border border-zinc-700 mx-8 md:mx-0 mt-6 mb-8 rounded-lg shadow-sm flex justify-center">
+            <div class="p-8 md:p-16 text-center">
+                <i class="bx bx-x-circle bx-lg text-danger-500"></i>
+                <h1>{{__("You don't have any groups please add a group to add one")}}</h1>
+                <div class="my-4">
+                    <x-circle-xo-button :href="route('profile.groups.create')" modal size="sm">
+                        {{__('Create Group')}}
+                    </x-circle-xo-button>
+                </div>
+            </div>
+        </div>
+    @else
+        <div class="mx-8 md:mx-0 mt-6 mb-8">
+            <x-splade-table :for="$table" custom-body custom-body-view="circle-contacts::contacts.list">
+
+            </x-splade-table>
+        </div>
+    @endif
+@endsection
+
+{{--<x-circle-xo-profile-layout>--}}
+{{--    {{ __('CircleXoContact') }}--}}
+
+{{--    <x-tomato-admin-button :modal="true" :href="route('profile.contacts.create')" type="link">--}}
+{{--        {{trans('tomato-admin::global.crud.create-new')}} {{__('CircleXoContact')}}--}}
+{{--    </x-tomato-admin-button>--}}
+
+{{--    <div class="pb-12">--}}
+{{--        <div class="mx-auto">--}}
+{{--            <x-splade-table :for="$table" striped>--}}
+{{--                <x-splade-cell email>--}}
+{{--                    <x-tomato-admin-row table type="email" :value="$item->email" />--}}
+{{--                </x-splade-cell>--}}
+{{--                <x-splade-cell phone>--}}
+{{--                    <x-tomato-admin-row table type="tel" :value="$item->phone" />--}}
+{{--                </x-splade-cell>--}}
+{{--                <x-splade-cell account_id>--}}
+{{--                    <x-tomato-admin-row table type="number" :value="$item->account_id" />--}}
+{{--                </x-splade-cell>--}}
+
+{{--                <x-splade-cell actions>--}}
+{{--                    <div class="flex justify-start">--}}
+{{--                        <x-tomato-admin-button success type="icon" title="{{trans('tomato-admin::global.crud.view')}}" modal :href="route('profile.contacts.show', $item->id)">--}}
+{{--                            <x-heroicon-s-eye class="h-6 w-6"/>--}}
+{{--                        </x-tomato-admin-button>--}}
+{{--                        <x-tomato-admin-button warning type="icon" title="{{trans('tomato-admin::global.crud.edit')}}" modal :href="route('profile.contacts.edit', $item->id)">--}}
+{{--                            <x-heroicon-s-pencil class="h-6 w-6"/>--}}
+{{--                        </x-tomato-admin-button>--}}
+{{--                        <x-tomato-admin-button danger type="icon" title="{{trans('tomato-admin::global.crud.delete')}}" :href="route('profile.contacts.destroy', $item->id)"--}}
+{{--                                               confirm="{{trans('tomato-admin::global.crud.delete-confirm')}}"--}}
+{{--                                               confirm-text="{{trans('tomato-admin::global.crud.delete-confirm-text')}}"--}}
+{{--                                               confirm-button="{{trans('tomato-admin::global.crud.delete-confirm-button')}}"--}}
+{{--                                               cancel-button="{{trans('tomato-admin::global.crud.delete-confirm-cancel-button')}}"--}}
+{{--                                               method="delete"--}}
+{{--                        >--}}
+{{--                            <x-heroicon-s-trash class="h-6 w-6"/>--}}
+{{--                        </x-tomato-admin-button>--}}
+{{--                    </div>--}}
+{{--                </x-splade-cell>--}}
+{{--            </x-splade-table>--}}
+{{--        </div>--}}
+{{--    </div>--}}
+{{--</x-circle-xo-profile-layout>--}}
diff --git a/Modules/CircleContacts/resources/views/contacts/list.blade.php b/Modules/CircleContacts/resources/views/contacts/list.blade.php
new file mode 100644
index 0000000..d2505cc
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/contacts/list.blade.php
@@ -0,0 +1,113 @@
+@if($table->resource->count() > 0)
+    <div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3">
+        @if(!request()->has('page') || (request()->has('page') && request()->get('page') == 1))
+            <div class=" flex flex-col gap-4 justify-center items-center h-full">
+                <x-splade-link :href="route('profile.contacts.create')" modal class="flex flex-col justify-center items-center text-center border border-zinc-700 rounded-lg w-full h-full">
+                    <div class="my-4">
+                        <i class="bx bxs-user text-7xl text-zinc-500"></i>
+                        <h1>{{__('Add Contact')}}</h1>
+                    </div>
+                </x-splade-link>
+                @if(request()->has('group_id'))
+                    <div class="flex justify-between gap-4 w-full">
+                        <x-splade-link :href="route('profile.groups.create')" modal class="flex flex-col justify-center items-center text-center border border-zinc-700 rounded-lg w-full h-full">
+                            <div class="my-4">
+                                <i class="bx bxs-group text-7xl text-zinc-500"></i>
+                                <h1>{{__('Add Group')}}</h1>
+                            </div>
+                        </x-splade-link>
+                        <div class="h-full flex flex-col gap-4 w-full">
+                            <x-splade-link :href="route('profile.groups.edit', request()->get('group_id'))" modal class="flex flex-col justify-center items-center text-center border border-zinc-700 rounded-lg w-full ">
+                                <div class="my-4">
+                                    <i class="bx bxs-edit text-5xl text-warning-500"></i>
+                                    <h1>{{__('Edit Group')}}</h1>
+                                </div>
+                            </x-splade-link>
+                            <x-splade-link :href="route('profile.groups.destroy', request()->get('group_id'))" confirm-danger method="DELETE" class="flex flex-col justify-center items-center text-center border border-zinc-700 rounded-lg w-full">
+                                <div class="my-4">
+                                    <i class="bx bxs-trash text-5xl text-danger-500"></i>
+                                    <h1>{{__('Delete Group')}}</h1>
+                                </div>
+                            </x-splade-link>
+                        </div>
+                    </div>
+                @else
+                    <x-splade-link :href="route('profile.groups.create')" modal class="flex flex-col justify-center items-center text-center border border-zinc-700 rounded-lg w-full h-full">
+                        <div class="my-4">
+                            <i class="bx bxs-group text-7xl text-zinc-500"></i>
+                            <h1>{{__('Add Group')}}</h1>
+                        </div>
+                    </x-splade-link>
+                @endif
+            </div>
+        @endif
+
+        @foreach($table->resource as $itemKey => $item)
+            @php $itemPrimaryKey = $table->findPrimaryKey($item) @endphp
+                <div class="bg-zinc-800 rounded-lg overflow-hidden shadow-md border border-zinc-700 p-4 min-w-64">
+                    <div class="flex flex-col items-center justify-center">
+                        <button class="my-4" @click.prevent="table.setSelectedItem(@js($itemPrimaryKey), table.itemIsSelected(@js($itemPrimaryKey)) ? false : true)">
+                            @if($item->getMedia('avatar')->first())
+                                <div class="w-24 h-24 rounded-full bg-zinc-800 border " :class="{'border-success-500': table.itemIsSelected(@js($itemPrimaryKey)), 'border-zinc-700' : !table.itemIsSelected(@js($itemPrimaryKey))}">
+                                    <img src="{{ $item->getMedia('avatar')->first()->getUrl() }}" class="w-24 h-24 rounded-full object-cover" alt="avatar">
+                                </div>
+                            @else
+                                <div class="w-24 h-24 rounded-full bg-zinc-800 border " :class="{'border-success-500': table.itemIsSelected(@js($itemPrimaryKey)), 'border-zinc-700' : !table.itemIsSelected(@js($itemPrimaryKey))}">
+                                    <div class="flex flex-col justify-center items-center text-center h-full">
+                                        <i class="bx bxs-user text-5xl text-zinc-500"></i>
+                                    </div>
+                                </div>
+                            @endif
+                        </button>
+                        <x-splade-link href="{{ route('profile.contacts.show', $item) }}" class="flex justify-center gap-2 font-bold w-full">
+                            <h1 class="text-xl truncate">{{ $item->name }}</h1>
+                            @if($item->groups)
+                                @foreach($item->groups as $group)
+                                    <div class="flex flex-col justify-center items-center mt-1">
+                                        <x-tomato-admin-tooltip :text="__($group->name)">
+                                            <div  style="color: {{$item->color}} !important;">
+                                                <i class="{{$group->icon ?: 'bx bxs-group'}} text-xl" ></i>
+                                            </div>
+                                        </x-tomato-admin-tooltip>
+                                    </div>
+                                @endforeach
+                            @endif
+                        </x-splade-link>
+                        <h6 class="text-sm font-medium text-zinc-300">{{$item->phone}}</h6>
+                        @if($item->address)
+                            <p class="text-xs text-center my-2 w-full truncate">
+                                {{$item->address}}
+                            </p>
+                        @endif
+                        <div class="my-4 flex justify-center gap-2">
+                            <x-splade-link modal href="{{route('profile.contacts.edit', $item)}}">
+                                <x-tomato-admin-tooltip :text="__('Edit')">
+                                    <i class="bx bx-edit bx-sm text-warning-400"></i>
+                                </x-tomato-admin-tooltip>
+                            </x-splade-link>
+                            <x-splade-link modal href="{{route('profile.contacts.edit', $item)}}">
+                                <x-tomato-admin-tooltip :text="__('Delete')" href="{{route('profile.contacts.destroy', $item)}}" method="DELETE" danger confirm-danger>
+                                    <i class="bx bx-trash bx-sm  text-danger-500"></i>
+                                </x-tomato-admin-tooltip>
+                            </x-splade-link>
+                        </div>
+                        <h6 class="my-2 text-sm text-zinc-300">
+                            {{__('Created')}} {{ $item->created_at->diffForHumans() }}
+                        </h6>
+                    </div>
+                </div>
+        @endforeach
+    </div>
+@else
+    <div class="bg-zinc-800 border border-zinc-700 mx-8 md:mx-0 mt-6 mb-8 rounded-lg shadow-sm flex justify-center">
+        <div class="p-8 md:p-16 text-center">
+            <i class="bx bx-x-circle bx-lg text-danger-500"></i>
+            <h1>{{__("You don't have any contact please add one")}}</h1>
+            <div class="my-4">
+                <x-circle-xo-button :href="route('profile.contacts.create')" modal size="sm">
+                    {{__('Create Contact')}}
+                </x-circle-xo-button>
+            </div>
+        </div>
+    </div>
+@endif
diff --git a/Modules/CircleContacts/resources/views/contacts/meta/create.blade.php b/Modules/CircleContacts/resources/views/contacts/meta/create.blade.php
new file mode 100644
index 0000000..f540acb
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/contacts/meta/create.blade.php
@@ -0,0 +1,14 @@
+<x-splade-modal>
+    <x-slot:title>
+        {{__('Add More Details')}}
+    </x-slot:title>
+    <x-splade-form class="flex flex-col space-y-4" action="{{route('profile.contacts.meta.store', $account)}}" method="post">
+        <x-splade-input :label="__('Name')" name="key" type="text"  :placeholder="__('Name')" />
+        <x-splade-textarea :label="__('Value')" name="value" :placeholder="__('Value')" autosize />
+
+        <div class="flex justify-start gap-2 pt-3">
+            <x-tomato-admin-submit  label="{{__('Save')}}" :spinner="true" />
+            <x-tomato-admin-button secondary type="button" @click.prevent="modal.close" label="{{__('Cancel')}}"/>
+        </div>
+    </x-splade-form>
+</x-splade-modal>
diff --git a/Modules/CircleContacts/resources/views/contacts/meta/edit.blade.php b/Modules/CircleContacts/resources/views/contacts/meta/edit.blade.php
new file mode 100644
index 0000000..16d3984
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/contacts/meta/edit.blade.php
@@ -0,0 +1,14 @@
+<x-splade-modal>
+    <x-slot:title>
+        {{__('Edit More Details')}}
+    </x-slot:title>
+    <x-splade-form :default="$model" class="flex flex-col space-y-4" action="{{route('profile.contacts.meta.update', ['account' => $account, 'model'=>$model])}}" method="post">
+        <x-splade-input :label="__('Name')" name="key" type="text"  :placeholder="__('Name')" />
+        <x-splade-textarea :label="__('Value')" name="value" :placeholder="__('Value')" autosize />
+
+        <div class="flex justify-start gap-2 pt-3">
+            <x-tomato-admin-submit  label="{{__('Save')}}" :spinner="true" />
+            <x-tomato-admin-button secondary type="button" @click.prevent="modal.close" label="{{__('Cancel')}}"/>
+        </div>
+    </x-splade-form>
+</x-splade-modal>
diff --git a/Modules/CircleContacts/resources/views/contacts/show.blade.php b/Modules/CircleContacts/resources/views/contacts/show.blade.php
new file mode 100644
index 0000000..d079df3
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/contacts/show.blade.php
@@ -0,0 +1,91 @@
+@extends('circle-contacts::layout.contact')
+
+@section('content')
+
+
+    <div class="my-4 flex flex-col justify-start gap-4 bg-zinc-900 rounded-lg border border-zinc-700 w-full overflow-hidden">
+        <div class="bg-zinc-800 w-full p-4 border-b border-zinc-700">
+            <h1>
+                {{__('Show Contact')}} #{{$model->id}}
+            </h1>
+        </div>
+        <div class="grid grid-cols-1 lg:grid-cols-12">
+            <div class="col-span-3 w-full h-full border-b lg:border-b-0 lg:border-r border-zinc-700 mb-4">
+                <div class="flex flex-col justify-center items-center py-4">
+                    <div class="my-4">
+                        @if($model->getMedia('avatar')->first())
+                            <div class="w-24 h-24 rounded-full bg-zinc-800 border border-zinc-700">
+                                <img src="{{ $model->getMedia('avatar')->first()->getUrl() }}" class="w-24 h-24 rounded-full object-cover" alt="avatar">
+                            </div>
+                        @else
+                            <div class="w-24 h-24 rounded-full bg-zinc-800 border border-zinc-700" >
+                                <div class="flex flex-col justify-center items-center text-center h-full">
+                                    <i class="bx bxs-user text-5xl text-zinc-500"></i>
+                                </div>
+                            </div>
+                        @endif
+                    </div>
+                    <x-splade-link href="{{ route('profile.contacts.show', $model) }}" class="flex justify-center gap-2 font-bold w-full">
+                        <h1 class="text-xl truncate">{{ $model->name }}</h1>
+                        @if($model->groups)
+                            @foreach($model->groups as $group)
+                                <div class="flex flex-col justify-center items-center mt-1">
+                                    <x-tomato-admin-tooltip :text="__($group->name)">
+                                        <div  style="color: {{$model->color}} !important;">
+                                            <i class="{{$group->icon ?: 'bx bxs-group'}} text-xl" ></i>
+                                        </div>
+                                    </x-tomato-admin-tooltip>
+                                </div>
+                            @endforeach
+                        @endif
+                    </x-splade-link>
+                    <h6 class="text-sm font-medium text-zinc-300">{{$model->phone}}</h6>
+                    @if($model->address)
+                        <p class="text-xs text-center my-2 w-full truncate">
+                            {{$model->address}}
+                        </p>
+                    @endif
+                </div>
+            </div>
+            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-4 col-span-1 lg:col-span-9">
+                <div>
+                    <h1 class="text-md font-bold text-zinc-300">{{__('Email')}}</h1>
+                    <p class="text-sm text-zinc-300">
+                        {{ $model->email }}
+                    </p>
+                </div>
+                <div>
+                    <h1 class="text-md font-bold text-zinc-300">{{__('Company')}}</h1>
+                    <p class="text-sm text-zinc-300">
+                        {{ $model->company }}
+                    </p>
+                </div>
+                @foreach($model->contactMeta as $meta)
+                    <div>
+                        <div class="flex justify-start gap-2">
+                            <h1 class="text-md font-bold text-zinc-300">{{str($meta->key)->title()}}</h1>
+                            <x-splade-link modal :href="route('profile.contacts.meta.edit',[$model, $meta])">
+                                <i class="bx bx-edit text-warning-400"></i>
+                            </x-splade-link>
+                            <x-splade-link confirm-danger method="DELETE" :href="route('profile.contacts.meta.destroy', [$model, $meta])">
+                                <i class="bx bx-trash text-danger-500"></i>
+                            </x-splade-link>
+                        </div>
+                        <p class="text-sm text-zinc-300">
+                            {{ $meta->value }}
+                        </p>
+                    </div>
+                @endforeach
+            </div>
+        </div>
+        <div class="flex justify-start gap-2  p-4 border-t border-zinc-700">
+            <x-tomato-admin-button modal :href="route('profile.contacts.meta.create', $model)" :label="__('Add More Details')" />
+            <x-tomato-admin-button danger :href="route('profile.contacts.destroy', $model->id)"
+                                   confirm="{{trans('tomato-admin::global.crud.delete-confirm')}}"
+                                   confirm-text="{{trans('tomato-admin::global.crud.delete-confirm-text')}}"
+                                   confirm-button="{{trans('tomato-admin::global.crud.delete-confirm-button')}}"
+                                   cancel-button="{{trans('tomato-admin::global.crud.delete-confirm-cancel-button')}}"
+                                   method="delete"  label="{{__('Delete')}}" />
+        </div>
+    </div>
+@endsection
diff --git a/Modules/CircleContacts/resources/views/groups/.gitkeep b/Modules/CircleContacts/resources/views/groups/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/resources/views/groups/create.blade.php b/Modules/CircleContacts/resources/views/groups/create.blade.php
new file mode 100644
index 0000000..fd8ccfd
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/groups/create.blade.php
@@ -0,0 +1,21 @@
+<x-splade-modal>
+    <x-slot:title>
+        {{__('New Group')}}
+    </x-slot:title>
+    <x-splade-form class="flex flex-col space-y-4" action="{{route('profile.groups.store')}}" method="post">
+
+        <x-splade-input :label="__('Name')" name="name" type="text"  :placeholder="__('Name')" />
+        <x-splade-textarea :label="__('Description')" name="description" :placeholder="__('Description')" autosize />
+        <div class="flex justify-between gap-4">
+            <x-tomato-admin-icon class="w-full" :label="__('Icon')" :placeholder="__('Icon')" name="icon" />
+            <x-tomato-admin-color :label="__('Color')" :placeholder="__('Color')" name="color" />
+        </div>
+
+        <div class="flex justify-start gap-2 pt-3">
+            <x-tomato-admin-submit  label="{{__('Save')}}" :spinner="true" />
+            <x-tomato-admin-button secondary type="button" @click.prevent="modal.close" label="{{__('Cancel')}}"/>
+        </div>
+    </x-splade-form>
+</x-splade-modal>
+
+
diff --git a/Modules/CircleContacts/resources/views/groups/edit.blade.php b/Modules/CircleContacts/resources/views/groups/edit.blade.php
new file mode 100644
index 0000000..980ba2b
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/groups/edit.blade.php
@@ -0,0 +1,25 @@
+<x-splade-modal>
+    <x-slot:title>
+        {{__('Edit Group')}} {{$model->name}}
+    </x-slot:title>
+    <x-splade-form class="flex flex-col space-y-4" action="{{route('profile.groups.update', $model->id)}}" method="post" :default="$model">
+
+        <x-splade-input :label="__('Name')" name="name" type="text"  :placeholder="__('Name')" />
+        <x-splade-textarea :label="__('Description')" name="description" :placeholder="__('Description')" autosize />
+        <div class="flex justify-between gap-4">
+            <x-tomato-admin-icon class="w-full" :label="__('Icon')" :placeholder="__('Icon')" name="icon" />
+            <x-tomato-admin-color :label="__('Color')" :placeholder="__('Color')" name="color" />
+        </div>
+
+        <div class="flex justify-start gap-2 pt-3">
+            <x-tomato-admin-submit  label="{{__('Save')}}" :spinner="true" />
+            <x-tomato-admin-button danger :href="route('profile.groups.destroy', $model->id)"
+                                   confirm="{{trans('tomato-admin::global.crud.delete-confirm')}}"
+                                   confirm-text="{{trans('tomato-admin::global.crud.delete-confirm-text')}}"
+                                   confirm-button="{{trans('tomato-admin::global.crud.delete-confirm-button')}}"
+                                   cancel-button="{{trans('tomato-admin::global.crud.delete-confirm-cancel-button')}}"
+                                   method="delete"  label="{{__('Delete')}}" />
+            <x-tomato-admin-button secondary type="button" @click.prevent="modal.close" label="{{__('Cancel')}}"/>
+        </div>
+    </x-splade-form>
+</x-splade-modal>
diff --git a/Modules/CircleContacts/resources/views/groups/index.blade.php b/Modules/CircleContacts/resources/views/groups/index.blade.php
new file mode 100644
index 0000000..14d225c
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/groups/index.blade.php
@@ -0,0 +1,43 @@
+<x-tomato-admin-layout>
+    <x-slot:header>
+        {{ __('CircleXoContactsGroup') }}
+    </x-slot:header>
+    <x-slot:buttons>
+        <x-tomato-admin-button :modal="true" :href="route('admin.circle-xo-contacts-groups.create')" type="link">
+            {{trans('tomato-admin::global.crud.create-new')}} {{__('CircleXoContactsGroup')}}
+        </x-tomato-admin-button>
+    </x-slot:buttons>
+
+    <div class="pb-12">
+        <div class="mx-auto">
+            <x-splade-table :for="$table" striped>
+                <x-splade-cell icon>
+    <x-tomato-admin-row table type="icon" :value="$item->icon" />
+</x-splade-cell>
+<x-splade-cell color>
+    <x-tomato-admin-row table type="color" :value="$item->color" />
+</x-splade-cell>
+
+                <x-splade-cell actions>
+                    <div class="flex justify-start">
+                        <x-tomato-admin-button success type="icon" title="{{trans('tomato-admin::global.crud.view')}}" modal :href="route('admin.circle-xo-contacts-groups.show', $item->id)">
+                            <x-heroicon-s-eye class="h-6 w-6"/>
+                        </x-tomato-admin-button>
+                        <x-tomato-admin-button warning type="icon" title="{{trans('tomato-admin::global.crud.edit')}}" modal :href="route('admin.circle-xo-contacts-groups.edit', $item->id)">
+                            <x-heroicon-s-pencil class="h-6 w-6"/>
+                        </x-tomato-admin-button>
+                        <x-tomato-admin-button danger type="icon" title="{{trans('tomato-admin::global.crud.delete')}}" :href="route('admin.circle-xo-contacts-groups.destroy', $item->id)"
+                           confirm="{{trans('tomato-admin::global.crud.delete-confirm')}}"
+                           confirm-text="{{trans('tomato-admin::global.crud.delete-confirm-text')}}"
+                           confirm-button="{{trans('tomato-admin::global.crud.delete-confirm-button')}}"
+                           cancel-button="{{trans('tomato-admin::global.crud.delete-confirm-cancel-button')}}"
+                           method="delete"
+                        >
+                            <x-heroicon-s-trash class="h-6 w-6"/>
+                        </x-tomato-admin-button>
+                    </div>
+                </x-splade-cell>
+            </x-splade-table>
+        </div>
+    </div>
+</x-tomato-admin-layout>
diff --git a/Modules/CircleContacts/resources/views/groups/show.blade.php b/Modules/CircleContacts/resources/views/groups/show.blade.php
new file mode 100644
index 0000000..3cc6260
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/groups/show.blade.php
@@ -0,0 +1,27 @@
+<x-splade-modal>
+    <x-slot:title>
+        {{__('Show Group')}} {{$model->name}}
+    </x-slot:title>
+
+    <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+
+        <x-tomato-admin-row :label="__('Name')" :value="$model->name" type="string" />
+
+        <x-tomato-admin-row :label="__('Description')" :value="$model->description" type="text" />
+
+        <x-tomato-admin-row :label="__('Icon')" :value="$model->icon" type="icon" />
+
+        <x-tomato-admin-row :label="__('Color')" :value="$model->color" type="color" />
+
+    </div>
+    <div class="flex justify-start gap-2 pt-3">
+        <x-tomato-admin-button warning label="{{__('Edit')}}" :href="route('profile.groups.edit', $model->id)"/>
+        <x-tomato-admin-button danger :href="route('profile.groups.destroy', $model->id)"
+                               confirm="{{trans('tomato-admin::global.crud.delete-confirm')}}"
+                               confirm-text="{{trans('tomato-admin::global.crud.delete-confirm-text')}}"
+                               confirm-button="{{trans('tomato-admin::global.crud.delete-confirm-button')}}"
+                               cancel-button="{{trans('tomato-admin::global.crud.delete-confirm-cancel-button')}}"
+                               method="delete"  label="{{__('Delete')}}" />
+        <x-tomato-admin-button secondary type="button" @click.prevent="modal.close" label="{{__('Cancel')}}"/>
+    </div>
+</x-splade-modal>
diff --git a/Modules/CircleContacts/resources/views/layout/contact.blade.php b/Modules/CircleContacts/resources/views/layout/contact.blade.php
new file mode 100644
index 0000000..b460a2c
--- /dev/null
+++ b/Modules/CircleContacts/resources/views/layout/contact.blade.php
@@ -0,0 +1,70 @@
+<x-circle-xo-profile-layout>
+    <div class="my-4">
+        <div @preserveScroll class="mx-8 lg:mx-0">
+            <Swiper
+                :breakpoints="{
+          '350': {
+            slidesPerView: 2,
+            spaceBetween: 10,
+          },
+          '768': {
+            slidesPerView: 3,
+            spaceBetween: 10,
+          },
+          '1024': {
+            slidesPerView: 4,
+            spaceBetween: 10,
+          },
+        }"
+                :space-between="10"
+                :loop="true"
+                :centeredSlides="true"
+                class="w-full lg:w-1/2"
+            >
+                <swiper-slide class="club-swiper-slide" >
+                    <div class="swiper-slide">
+                        <Link preserve-scroll href="{{ route('profile.contacts.index') }}"
+                              class="@if(url()->current() === route('profile.contacts.index') && !request()->has('group_id')) font-bold bg-zinc-800 @endif px-4 md:px-6 py-2 flex flex-col text-center justify-center gap-2 border border-zinc-700 rounded-lg shadow-sm"
+                        >
+                        <div class="flex flex-col justify-center items-center">
+                            <div class="rounded-full bg-main-600 h-10 w-10 flex flex-col justify-center items-center">
+                                <i class="bx bxs-user text-xl"></i>
+                            </div>
+                        </div>
+                        <div>
+                            {{ __('All Contacts') }}
+                        </div>
+                        </Link>
+                    </div>
+                </swiper-slide>
+                @php $groups = \Modules\CircleContacts\App\Models\CircleXoContactsGroup::all(); @endphp
+                @foreach($groups as $group)
+                    <swiper-slide class="club-swiper-slide" >
+                        <div class="swiper-slide">
+                            <Link preserve-scroll href="{{ route('profile.contacts.index') .'?group_id='. $group->id }}"
+                                  class="@if(request()->has('group_id') && request()->get('group_id') == $group->id) font-bold bg-zinc-800 @endif px-4 md:px-6 py-2 flex flex-col text-center justify-center gap-2 border border-zinc-700 rounded-lg shadow-sm"
+                            >
+                            <div class="flex flex-col justify-center items-center">
+                                <div style="background-color: {{ $group->color ?: 'rgb(0 224 178 / var(--tw-text-opacity))' }}" class="rounded-full h-10 w-10 flex flex-col justify-center items-center">
+                                    @if($group->icon)
+                                        <i class="{{ $group->icon }} text-xl"></i>
+                                    @else
+                                        <i class="bx bxs-group text-xl"></i>
+                                    @endif
+                                </div>
+                            </div>
+                            <div>
+                                {{ $group->name }}
+                            </div>
+                            </Link>
+                        </div>
+                    </swiper-slide>
+                @endforeach
+
+            </Swiper>
+        </div>
+        <div class="mx-8 lg:mx-16">
+            @yield('content')
+        </div>
+    </div>
+</x-circle-xo-profile-layout>
diff --git a/Modules/CircleContacts/resources/views/layout/parts/sidebar.blade.php b/Modules/CircleContacts/resources/views/layout/parts/sidebar.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/routes/.gitkeep b/Modules/CircleContacts/routes/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Modules/CircleContacts/routes/api.php b/Modules/CircleContacts/routes/api.php
new file mode 100644
index 0000000..2ce6688
--- /dev/null
+++ b/Modules/CircleContacts/routes/api.php
@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Route;
+
+/*
+    |--------------------------------------------------------------------------
+    | API Routes
+    |--------------------------------------------------------------------------
+    |
+    | Here is where you can register API routes for your application. These
+    | routes are loaded by the RouteServiceProvider within a group which
+    | is assigned the "api" middleware group. Enjoy building your API!
+    |
+*/
+
diff --git a/Modules/CircleContacts/routes/web.php b/Modules/CircleContacts/routes/web.php
new file mode 100644
index 0000000..91a19b0
--- /dev/null
+++ b/Modules/CircleContacts/routes/web.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\CircleContacts\App\Http\Controllers\CircleContactsController;
+
+/*
+|--------------------------------------------------------------------------
+| Web Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register web routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| contains the "web" middleware group. Now create something great!
+|
+*/
+
+
+Route::middleware(['auth:accounts','app:circle-contacts', 'splade', 'verified'])->name('profile.')->group(function () {
+    Route::get('profile/contacts', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'index'])->name('contacts.index');
+    Route::get('profile/contacts/api', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'api'])->name('contacts.api');
+    Route::get('profile/contacts/api', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'api'])->name('contacts.api');
+    Route::get('profile/contacts/create', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'create'])->name('contacts.create');
+    Route::post('profile/contacts', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'store'])->name('contacts.store');
+    Route::get('profile/contacts/{model}', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'show'])->name('contacts.show');
+    Route::get('profile/contacts/{model}/edit', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'edit'])->name('contacts.edit');
+    Route::post('profile/contacts/{model}', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'update'])->name('contacts.update');
+    Route::delete('profile/contacts/{model}', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactController::class, 'destroy'])->name('contacts.destroy');
+});
+
+Route::middleware(['auth:accounts','app:circle-contacts', 'splade', 'verified'])->prefix('/profile/contacts/{account}/meta')->name('profile.contacts.meta.')->group(function () {
+    Route::get('/create', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsMetaController::class, 'create'])->name('create');
+    Route::post('/create', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsMetaController::class, 'store'])->name('store');
+    Route::get('/{model}/edit', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsMetaController::class, 'edit'])->name('edit');
+    Route::post('/{model}', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsMetaController::class, 'update'])->name('update');
+    Route::delete('/{model}', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsMetaController::class, 'destroy'])->name('destroy');
+});
+
+Route::middleware(['auth:accounts','app:circle-contacts', 'splade', 'verified'])->name('profile.')->group(function () {
+    Route::get('profile/groups', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsGroupController::class, 'index'])->name('groups.index');
+    Route::get('profile/groups/api', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsGroupController::class, 'api'])->name('groups.api');
+    Route::get('profile/groups/create', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsGroupController::class, 'create'])->name('groups.create');
+    Route::post('profile/groups', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsGroupController::class, 'store'])->name('groups.store');
+    Route::get('profile/groups/{model}', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsGroupController::class, 'show'])->name('groups.show');
+    Route::get('profile/groups/{model}/edit', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsGroupController::class, 'edit'])->name('groups.edit');
+    Route::post('profile/groups/{model}', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsGroupController::class, 'update'])->name('groups.update');
+    Route::delete('profile/groups/{model}', [\Modules\CircleContacts\App\Http\Controllers\CircleXoContactsGroupController::class, 'destroy'])->name('groups.destroy');
+});
diff --git a/Modules/CircleContacts/vite.config.js b/Modules/CircleContacts/vite.config.js
new file mode 100644
index 0000000..c5bf9b8
--- /dev/null
+++ b/Modules/CircleContacts/vite.config.js
@@ -0,0 +1,26 @@
+import { defineConfig } from 'vite';
+import laravel from 'laravel-vite-plugin';
+
+export default defineConfig({
+    build: {
+        outDir: '../../public/build-circlecontacts',
+        emptyOutDir: true,
+        manifest: true,
+    },
+    plugins: [
+        laravel({
+            publicDirectory: '../../public',
+            buildDirectory: 'build-circlecontacts',
+            input: [
+                __dirname + '/resources/assets/sass/app.scss',
+                __dirname + '/resources/assets/js/app.js'
+            ],
+            refresh: true,
+        }),
+    ],
+});
+
+//export const paths = [
+//    'Modules/$STUDLY_NAME$/resources/assets/sass/app.scss',
+//    'Modules/$STUDLY_NAME$/resources/assets/js/app.js',
+//];
\ No newline at end of file
diff --git a/Modules/CircleXO/resources/views/components/menu-items.blade.php b/Modules/CircleXO/resources/views/components/menu-items.blade.php
index e2a7641..eb4df66 100644
--- a/Modules/CircleXO/resources/views/components/menu-items.blade.php
+++ b/Modules/CircleXO/resources/views/components/menu-items.blade.php
@@ -13,21 +13,10 @@
     <span class="ms-3 text-zinc-300 group-hover:text-white">{{__('Blog')}}</span>
 </x-splade-link>
 
-@php $providerMenus = \Modules\CircleApps\App\Facades\CircleApps::menus(); @endphp
-
-@foreach($providerMenus as $item)
-    @if($item->group === 'profile' && auth('accounts')->user())
-    <x-splade-link :href="route($item->route)" class="flex items-center p-2 text-xl rounded-lg hover:bg-zinc-700 group transition-all">
-        <i class="{{$item->icon}} text-zinc-100 transition duration-75 group-hover:text-white"></i>
-        <span class="ms-3 text-zinc-300 group-hover:text-white">{{$item->label}}</span>
-    </x-splade-link>
-    @elseif($item->group !== 'profile')
-        <x-splade-link :href="route($item->route)" class="flex items-center p-2 text-xl rounded-lg hover:bg-zinc-700 group transition-all">
-            <i class="{{$item->icon}} text-zinc-100 transition duration-75 group-hover:text-white"></i>
-            <span class="ms-3 text-zinc-300 group-hover:text-white">{{$item->label}}</span>
-        </x-splade-link>
-    @endif
-@endforeach
+{{--<x-splade-link :href="route('apps.index')" class="flex items-center p-2 text-xl rounded-lg hover:bg-zinc-700 group transition-all">--}}
+{{--    <i class="bx bxs-plug text-zinc-100 transition duration-75 group-hover:text-white"></i>--}}
+{{--    <span class="ms-3 text-zinc-300 group-hover:text-white">{{__('Apps')}}</span>--}}
+{{--</x-splade-link>--}}
 
 
 @foreach(menu('main') as $item)
@@ -59,6 +48,16 @@
 @endforeach
 
 @if(auth('accounts')->user())
+    @php $providerMenus = \Modules\CircleApps\App\Facades\CircleApps::menus(); @endphp
+
+    @foreach($providerMenus as $item)
+        @if(has_app($item->group))
+            <x-splade-link :href="route($item->route)" class="flex items-center p-2 text-xl rounded-lg hover:bg-zinc-700 group transition-all">
+                <i class="{{$item->icon}} text-zinc-100 transition duration-75 group-hover:text-white"></i>
+                <span class="ms-3 text-zinc-300 group-hover:text-white">{{$item->label}}</span>
+            </x-splade-link>
+        @endif
+    @endforeach
     <x-splade-link :href="route('profile.index')" class="flex items-center p-2 text-xl rounded-lg hover:bg-zinc-700 group transition-all">
         <i class="bx bx-user-circle text-zinc-100 transition duration-75 group-hover:text-white"></i>
         <span class="ms-3 text-zinc-300 group-hover:text-white">{{__('Profile')}}</span>
diff --git a/lang/en.json b/lang/en.json
index d50d413..1a3ffbe 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -57,8 +57,8 @@
     "Resend Verification Email": "Resend Verification Email",
     "Log Out": "Log Out",
     "Pagination Navigation": "Pagination Navigation",
-    "pagination.previous": "pagination.previous",
-    "pagination.next": "pagination.next",
+    "pagination.previous": "Previous",
+    "pagination.next": "Next",
     "Showing": "Showing",
     "to": "to",
     "of": "of",
@@ -238,4 +238,4 @@
     "Date": "Date",
     "Home": "Home",
     "Documentation": "Documentation"
-}
\ No newline at end of file
+}
diff --git a/modules_statuses.json b/modules_statuses.json
index b66bfc9..d14478b 100644
--- a/modules_statuses.json
+++ b/modules_statuses.json
@@ -13,5 +13,6 @@
     "TomatoThemes": true,
     "TomatoSupport": true,
     "TomatoSections": true,
-    "TomatoMenus": true
-}
+    "TomatoMenus": true,
+    "CircleContacts": true
+}
\ No newline at end of file