diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
index cace061..7a3673b 100644
--- a/app/Http/Controllers/Auth/RegisteredUserController.php
+++ b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -18,6 +18,13 @@
 class RegisteredUserController extends Controller
 {
 
+    /**
+     * Display the registration view.
+     */
+    public function create(): View
+    {
+        return view('auth.register');
+    }
     /**
      * Handle an incoming registration request.
      *
diff --git a/app/Livewire/Register.php b/app/Livewire/Register.php
index 75970c3..c57241d 100644
--- a/app/Livewire/Register.php
+++ b/app/Livewire/Register.php
@@ -12,14 +12,13 @@
 use Illuminate\Foundation\Application;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\View\View;
-use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class Register extends Component
 {
-
     public $name;
     public $email;
     public $phone;
@@ -27,9 +26,24 @@ class Register extends Component
     public $password;
     public $password_confirmation;
 
-    public function register(): Application|Redirector|\Illuminate\Contracts\Foundation\Application|RedirectResponse
+    public function mount(): void
     {
+        $this->location = $this->getUserCountry();
+    }
 
+    public function getUserCountry(): string
+    {
+        try {
+            $response = Http::get('https://ipinfo.io/json');
+            $data = $response->json();
+            return $data['country'] ?? 'Unknown';
+        } catch (\Exception $e) {
+            return 'Unknown';
+        }
+    }
+
+    public function register(): Application|Redirector|\Illuminate\Contracts\Foundation\Application|RedirectResponse
+    {
         $user_data_array = [
             'name' => $this->name,
             'email' => $this->email,
@@ -38,8 +52,6 @@ public function register(): Application|Redirector|\Illuminate\Contracts\Foundat
             'password' => Hash::make($this->password),
         ];
 
-        dd($user_data_array);
-
         $this->validate([
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:' . User::class],
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 644e454..5e50003 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -1,7 +1,6 @@
-<div>
+<x-guest-layout>
     <form wire:submit.prevent="register">
         @csrf
-
         <!-- Name -->
         <div>
             <x-input-label for="name" :value="__('Name')"/>
@@ -14,14 +13,14 @@
         <div>
             <div class="flex items-end">
                 <!-- Phone Number -->
-                <div data-tip="Make sure we can contact you" class="mt-4 tooltip w-1/2 mr-2">
-                    <x-input-label for="phone" :value="__('Phone Number')"></x-input-label>
+                <div data-tip="Make sure we can contact you" class="mt-4 flex flex-col justify-start tooltip w-1/2 mr-2">
+                    <x-input-label class="text-start mb-1" for="phone" :value="__('Phone Number')"></x-input-label>
                     <x-text-input id="phone" class="block tooltip mt-1 w-full" type="tel" wire:model="phone" required
                                   autocomplete="phone"/>
                 </div>
 
                 <!-- Location -->
-                <div class="mt-4 w-1/2 ml-2">
+                <div class="mt-4 ml-2">
                     <x-input-label for="location" :value="__('Location')"></x-input-label>
                     <x-text-input id="location" disabled class="block mt-1 w-full" type="text" wire:model="location" required
                                   autocomplete="location"/>
@@ -71,28 +70,15 @@
         </div>
     </form>
 
-    @script
     <script>
         let phoneInputField = document.querySelector("#phone");
         let phoneInput = window.intlTelInput(phoneInputField, {
             utilsScript: "https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/17.0.8/js/utils.js",
             initialCountry: "auto",
             geoIpLookup: function (success, failure) {
-                fetch("https://ipinfo.io", {
-                    headers: {
-                        "Accept": "application/json",
-                    }
-                }).then((resp) => {
-                    if (resp.ok) {
-                        return resp.json();
-                    }
-                    throw new Error("Failed to fetch location");
-                }).then((data) => {
-                    success(data.country);
-                    alert(data.country)
-                }).catch(() => {
-                    failure("US");
-                });
+                data = {
+                    ip: "{{ request()->ip() }}"
+                };
             },
         });
 
@@ -101,8 +87,6 @@
             let countryData = phoneInput.getSelectedCountryData();
             document.querySelector("#location").value = countryData.name;
             // update wire location
-            @this.set('location', countryData.name);
         });
     </script>
-    @endscript
-</div>
+</x-guest-layout>
diff --git a/routes/auth.php b/routes/auth.php
index f8e92bb..d2a7f6a 100644
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -13,7 +13,7 @@
 use Illuminate\Support\Facades\Route;
 
 Route::middleware('guest')->group(function () {
-    Route::get('register', Register::class)
+    Route::get('register', [RegisteredUserController::class, 'create'])
                 ->name('register');
 
     Route::post('register', [RegisteredUserController::class, 'store']);