diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php
index 1ee4017..24df63b 100644
--- a/resources/lang/id/app.php
+++ b/resources/lang/id/app.php
@@ -1,45 +1,50 @@
 <?php
 
 return [
+    // Labels
     'table_no'              => '#',
-    'name'                  => 'Nama',
+    'no'                    => 'Tidak',
+    'label'                 => 'Label',
+    'action'                => 'Pilihan',
+    'welcome'               => 'Selamat Datang',
+    'to'                    => 'Kepada',
+    'from'                  => 'Dari',
+    'active'                => 'Aktif',
+    'in_active'             => 'Non Aktif',
+    'show_detail_title'     => 'Lihat detail :type :name',
+    'active'                => 'Status',
+    'status'                => 'Status',
+    'total'                 => 'Total',
+    'count'                 => 'Jumlah',
+
+    // Action
+    'add'                   => 'Tambah',
     'submit'                => 'Submit',
     'update'                => 'Simpan Perubahan',
     'delete'                => 'Hapus',
-    'add'                   => 'Tambah',
     'back'                  => 'Kembali',
     'cancel'                => 'Batal',
     'reset'                 => 'Reset',
-    'no'                    => 'Tidak',
     'show'                  => 'Lihat Detail',
-    'label'                 => 'Label',
     'edit'                  => 'Edit',
     'print'                 => 'Cetak',
     'search'                => 'Cari',
     'filter'                => 'Filter',
     'pick'                  => 'Pilih',
     'close'                 => 'Tutup',
-    'action'                => 'Pilihan',
-    'notes'                 => 'Catatan',
     'delete_confirm_button' => 'Ya, silakan hapus!',
     'delete_confirm'        => 'Anda yakin ingin menghapus?',
+    'change_photo'          => 'Ganti Foto',
+
+    // Attributes
+    'name'                  => 'Nama',
+    'notes'                 => 'Catatan',
     'description'           => 'Deskripsi',
     'code'                  => 'Kode',
-    'active'                => 'Status',
-    'status'                => 'Status',
     'date'                  => 'Tanggal',
     'time'                  => 'Jam',
     'created_at'            => 'Dibuat pada',
     'created_by'            => 'Oleh',
-    'total'                 => 'Total',
-    'count'                 => 'Jumlah',
-    'photo'                 => 'Foto',
     'start_date'            => 'Tanggal Mulai',
     'end_date'              => 'Tanggal Selesai',
-    'change_photo'          => 'Ganti Foto',
-    'welcome'               => 'Selamat Datang',
-    'to'                    => 'Kepada',
-    'active'                => 'Aktif',
-    'in_active'             => 'Non Aktif',
-    'show_detail_title'     => 'Lihat detail :type :name',
 ];
diff --git a/resources/lang/id/contact.php b/resources/lang/id/contact.php
index 40cff73..44c8566 100644
--- a/resources/lang/id/contact.php
+++ b/resources/lang/id/contact.php
@@ -3,6 +3,7 @@
 return [
     'contact'   => 'Kontak',
     'phone'     => 'Telepon',
+    'phone_abb' => 'Telp.',
     'cellphone' => 'Telepon Selular',
     'email'     => 'Email',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/id/payment.php b/resources/lang/id/payment.php
index da0557d..7bba539 100644
--- a/resources/lang/id/payment.php
+++ b/resources/lang/id/payment.php
@@ -8,6 +8,10 @@ return [
     'not_found'     => 'Pembayaran tidak ditemukan',
     'empty'         => 'Belum ada Pembayaran',
     'back_to_index' => 'Kembali ke daftar Pembayaran',
+    'receipt'       => 'Bukti Pembayaran',
+    'from'          => 'Terima dari',
+    'cash_amount'   => 'Uang Sejumlah',
+    'words_amount'  => 'Terbilang',
 
     // Actions
     'create'        => 'Input Pembayaran Baru',
@@ -23,7 +27,7 @@ return [
     'print'         => 'Cetak Kuitansi',
 
     // Attrubutes
-    'description'   => 'Deskripsi',
+    'description'   => 'Untuk Pembayaran',
     'date'          => 'Tanggal Pembayaran',
     'in_out'        => 'Jenis Transaksi',
     'type'          => 'Jenis Pembayaran',
@@ -33,4 +37,4 @@ return [
     'cash_in'       => 'Pemasukan',
     'cash_out'      => 'Pengeluaran',
     'payer'         => 'Pembayar',
-];
\ No newline at end of file
+];
diff --git a/resources/views/payments/pdf.blade.php b/resources/views/payments/pdf.blade.php
index a4a8f67..6f266de 100755
--- a/resources/views/payments/pdf.blade.php
+++ b/resources/views/payments/pdf.blade.php
@@ -27,34 +27,33 @@
                 </td>
                 <td style="width:350px">
                     <div style="width:280px">
-                        <h4 style="margin:0px; border-bottom: 3px; font-size: 21.5px">JasaWebsiteBanjarmasin.com</h4>
+                        <h4 style="margin:0px; border-bottom: 3px; font-size: 21.5px">{{ auth()->user()->agency->name }}</h4>
+                        {{-- TODO: Agency tagline attribute --}}
                         <div style="font-size:13px">Jasa Pembuatan Website dan Aplikasi Berbasis Web</div>
                         <hr style="margin: 2px 0">
                         <div style="font-size:11px">
-                            Jln. Pramuka, Gg. Mawar, Rt. 09, No. 60, Kel. Pemurus Luar<br>
-                            Kec. Banjarmasin Timur, Kota Banjarmasin,
-                            Kalsel - 70249,<br>
-                            Telp. 0817 532 654 / 0823 5035 5470
+                            {!! nl2br(auth()->user()->agency->address) !!}<br>
+                            @lang('contact.phone_abb') {{ auth()->user()->agency->phone }}<br>
                         </div>
                     </div>
                 </td>
                 <td style="width:250px; text-align: center;">
-                    <h3 style="margin: 3px 0; font-size: 24px">Bukti Pembayaran</h3>
+                    <h3 style="margin: 3px 0; font-size: 24px">@lang('payment.receipt')</h3>
                     {{-- <p>No. Invoice: __________</p> --}}
                 </td>
             </tr>
             <tr>
-                <td>Terima Dari : </td>
-                <td colspan="2" style="border-bottom: 1px solid #ccc;">{{ $payment->customer->name }}</td>
+                <td>@lang('payment.from') : </td>
+                <td colspan="2" style="border-bottom: 1px solid #ccc;">{{ $payment->partner->name }}</td>
             </tr>
             <tr style="vertical-align: top;">
-                <td>Uang Sejumlah : </td>
+                <td>@lang('payment.cash_amount') : </td>
                 <td colspan="2" style="border-bottom: 1px solid #ccc;height: 35px">
                     {{ ucwords(Terbilang::make($payment->amount)) }} Rupiah
                 </td>
             </tr>
             <tr style="vertical-align: top;">
-                <td>Untuk Pembayaran :</td>
+                <td>@lang('payment.description') :</td>
                 <td colspan="2" style="border-bottom: 1px solid #ccc;height: 35px">
                     {{ $payment->description }}
                 </td>
@@ -63,20 +62,21 @@
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
                 <td style="text-align: center;">
+                    {{-- TODO: Agency city attribute --}}
                     Banjarmasin, {{ dateId($payment->date) }}
                 </td>
             </tr>
             <tr>
-                <td style="font-size: 20px; font-weight: bold; text-align: center;height: 100px;vertical-align: bottom;">Terbilang</td>
+                <td style="font-size: 20px; font-weight: bold; text-align: center;height: 100px;vertical-align: bottom;">@lang('payment.words_amount')</td>
                 <td style="font-size: 20px; font-weight: bold; vertical-align: bottom;">
                     {{ formatRp($payment->amount) }},-
                 </td>
                 <td style="text-align: center;vertical-align: bottom;">
                     <strong>{{ auth()->user()->name }}, S. Kom.</strong> <br>
-                    JasaWebsiteBanjarmasin.com
+                    {{ auth()->user()->agency->name }}
                 </td>
             </tr>
         </tbody>
     </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/resources/views/projects/payments.blade.php b/resources/views/projects/payments.blade.php
index c1d1eb4..5a2c77b 100755
--- a/resources/views/projects/payments.blade.php
+++ b/resources/views/projects/payments.blade.php
@@ -26,9 +26,9 @@
                     <th>{{ trans('app.table_no') }}</th>
                     <th class="col-md-2 text-center">{{ trans('app.date') }}</th>
                     <th class="col-md-2 text-right">{{ trans('payment.amount') }}</th>
-                    <th class="col-md-2">{{ $key == 1 ? 'Dari' : 'Ke' }}</th>
-                    <th class="col-md-5">{{ trans('payment.description') }}</th>
-                    <th>{{ trans('app.action') }}</th>
+                    <th class="col-md-2">{{ $key == 1 ? trans('app.from') : trans('app.to') }}</th>
+                    <th class="col-md-4">{{ trans('payment.description') }}</th>
+                    <th class="text-center">{{ trans('app.action') }}</th>
                 </thead>
                 <tbody>
                     @forelse($payments as $key => $payment)
@@ -38,7 +38,12 @@
                         <td class="text-right">{{ formatRp($payment->amount) }}</td>
                         <td>{{ $payment->partner->name }}</td>
                         <td>{{ $payment->description }} [{{ $payment->type() }}]</td>
-                        <td>{!! html_link_to_route('payments.show','',[$payment->id],['class' => 'btn btn-info btn-xs','icon' => 'search','title' => 'Lihat ' . trans('payment.show')]) !!}</td>
+                        <td class="text-center">
+                            {!! html_link_to_route('payments.show','',[$payment->id],['class' => 'btn btn-info btn-xs','icon' => 'search','title' => 'Lihat ' . trans('payment.show')]) !!}
+                            @if ($payment->in_out == 1)
+                            {!! html_link_to_route('payments.pdf','',[$payment->id],['class' => 'btn btn-success btn-xs','icon' => 'print','title' => trans('payment.print')]) !!}
+                            @endif
+                        </td>
                     </tr>
                     @empty
                     <tr><td colspan="6">{{ trans('payment.empty') }}</td></tr>
diff --git a/resources/views/users/agency/show.blade.php b/resources/views/users/agency/show.blade.php
index 2088ae3..5b7ad08 100644
--- a/resources/views/users/agency/show.blade.php
+++ b/resources/views/users/agency/show.blade.php
@@ -13,7 +13,7 @@
                 <tr><th class="col-xs-4">{{ trans('agency.name') }}</th><td>{{ $agency->name }}</td></tr>
                 <tr><th>{{ trans('agency.email') }}</th><td>{{ $agency->email }}</td></tr>
                 <tr><th>{{ trans('agency.phone') }}</th><td>{{ $agency->phone }}</td></tr>
-                <tr><th>{{ trans('agency.address') }}</th><td>{{ $agency->address }}</td></tr>
+                <tr><th>{{ trans('agency.address') }}</th><td>{!! nl2br($agency->address) !!}</td></tr>
                 <tr><th>{{ trans('agency.website') }}</th><td>{{ $agency->website }}</td></tr>
             </table>
             <div class="panel-footer">