diff --git a/resources/lang/en/address.php b/resources/lang/en/address.php
new file mode 100644
index 0000000..fa89ac2
--- /dev/null
+++ b/resources/lang/en/address.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'address'       => 'Address',
+    'location_name' => 'Location Name',
+    'latitude'      => 'Latitude',
+    'longitude'     => 'Longitude',
+];
diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php
index e612bd0..db08fb0 100644
--- a/resources/lang/en/user.php
+++ b/resources/lang/en/user.php
@@ -51,6 +51,8 @@ return [
     'phone'    => 'Phone',
     'manager'  => 'Manager',
 
+    'cemetery_location' => 'Cemetary Location',
+
     // Photo
     'reupload_photo' => 'Re-upload Photo',
     'update_photo'   => 'Update Photo',
diff --git a/resources/lang/id/address.php b/resources/lang/id/address.php
new file mode 100644
index 0000000..521a206
--- /dev/null
+++ b/resources/lang/id/address.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'address'       => 'Alamat',
+    'location_name' => 'Nama Lokasi',
+    'latitude'      => 'Latitude',
+    'longitude'     => 'Longitude',
+];
diff --git a/resources/lang/id/user.php b/resources/lang/id/user.php
index 8668553..8c4e8a3 100644
--- a/resources/lang/id/user.php
+++ b/resources/lang/id/user.php
@@ -51,6 +51,8 @@ return [
     'phone'    => 'Telp.',
     'manager'  => 'Pengelola',
 
+    'cemetery_location' => 'Cemetary Location',
+
     // Photo
     'reupload_photo' => 'Upload ulang Foto',
     'update_photo'   => 'Update Foto',
diff --git a/resources/views/users/partials/edit_death.blade.php b/resources/views/users/partials/edit_death.blade.php
index 0bce3a4..0b42a64 100644
--- a/resources/views/users/partials/edit_death.blade.php
+++ b/resources/views/users/partials/edit_death.blade.php
@@ -2,7 +2,13 @@
     <div class="col-md-6">{!! FormField::text('yod', ['label' => __('user.yod'), 'placeholder' => __('app.example').' 2003']) !!}</div>
     <div class="col-md-6">{!! FormField::text('dod', ['label' => __('user.dod'), 'placeholder' => __('app.example').' 2003-10-17']) !!}</div>
 </div>
-{!! FormField::text('cemetery_location_name', ['label' => __('user.cemetery_location_name')]) !!}
-{!! FormField::text('cemetery_location_address', ['label' => __('user.cemetery_location_address')]) !!}
-{!! FormField::text('cemetery_location_latitude', ['label' => __('user.cemetery_location_latitude')]) !!}
-{!! FormField::text('cemetery_location_longitude', ['label' => __('user.cemetery_location_longitude')]) !!}
\ No newline at end of file
+
+<fieldset>
+    <legend>{{ __('user.cemetery_location') }}</legend>
+    {!! FormField::text('cemetery_location_name', ['label' => __('address.location_name')]) !!}
+    {!! FormField::textarea('cemetery_location_address', ['label' => __('address.address')]) !!}
+    <div class="row">
+        <div class="col-md-6">{!! FormField::text('cemetery_location_latitude', ['label' => __('address.latitude')]) !!}</div>
+        <div class="col-md-6">{!! FormField::text('cemetery_location_longitude', ['label' => __('address.longitude')]) !!}</div>
+    </div>
+</fieldset>