diff --git a/lang/id_ID.ini b/lang/id_ID.ini
index 53029b9..871511b 100644
--- a/lang/id_ID.ini
+++ b/lang/id_ID.ini
@@ -22,7 +22,7 @@ Description = "Deskripsi"
 Draft = "Draft"
 Edit = "Edit"
 Edit_profile = "Edit profil"
-Filename = "nama berkas"
+Filename = "Nama berkas"
 Follow = "Ikuti"
 Image_post = "Artikel bergambar"
 Image_post_comment = "Membuat artikel dengan gambar unggulan"
@@ -47,9 +47,9 @@ Older = "Lebih lama"
 Operations = "Operasi"
 Popular_posts = "Artikel populer"
 Popular_tags = "Tag populer"
-Posted_in = "terpublis di"
-Posted_on = "terpublis pada"
-Posts = "artikel"
+Posted_in = "Terpublis di"
+Posted_on = "Terpublis pada"
+Posts = "Artikel"
 Prev = "Sebelumnya"
 Prev_post = "Artikel sebelumnya"
 Publish = "Terpublikasi"
@@ -70,9 +70,9 @@ Static_page = "Halaman statis"
 Static_page_comment = "Membuat halaman statis"
 Static_pages = "Halaman statis"
 Tag = "Tag"
-Tags = "Tag-tag"
+Tags = "Tag"
 Title = "Judul"
-Uncategorized = "Tak berkategoti"
+Uncategorized = "Uncategorized"
 Uncategorized_comment = "Topik yang tidak perlu kategori, atau tidak cocok dengan kategori yang ada"
 Update = "Update"
 Update_draft = "Perbarui draf"
@@ -82,7 +82,7 @@ Video_post_comment = "Membuat artikel dengan video unggulan"
 View = "Lihat"
 Views = "Lihat"
 Your_recent_posts = "Artikel terbaru Anda"
-by = "oleh"
+by = "Oleh"
 read_more = "Baca"
 Dashboard = "Dashboard"
 Posts_list = "Daftar artikel"
@@ -90,60 +90,60 @@ Posts_draft = "Daftar draf"
 Menus = "Menu Editor"
 Settings = "Pengaturan"
 Tools = "Alat"
-Check_update = "cek pembaruan"
+Check_update = "Cek pembaruan"
 Import_RSS = "Impor RSS"
-User = "pengguna"
+User = "Pengguna"
 Proudly_powered_by = "Dengan bangga ditenagai"
 Home = "Beranda"
 Type_to_search = "Ketik untuk mencari"
 Admin_panel_style_based_on = "Gaya panel admin berdasarkan"
-Sign_in_to_start_your_session = "masuk untuk memulai sesi Anda"
+Sign_in_to_start_your_session = "Masuk untuk memulai sesi Anda"
 Back_to = "Kembali ke"
-Login = "masuk"
-User = "pengguna"
+Login = "Masuk"
+User = "Pengguna"
 Password = "sandi"
-Comma_separated_values = "pisahkan dengan koma"
+Comma_separated_values = "Pisahkan dengan koma"
 If_leave_empty_we_will_excerpt_it_from_the_content_below = "Jika dibiarkan kosong kami akan mengutipnya dari konten di bawah ini"
-optional = "opsional"
+optional = "Opsional"
 If_the_url_leave_empty_we_will_use_the_post_title = "Jika URL dibiarkan kosong kita akan menggunakan judul artikel"
 If_the_url_leave_empty_we_will_use_the_page_title = "Jika url dibiarkan kosong kita akan menggunakan judul halaman"
-Only = "hanya"
-Featured_Audio = "audio Unggulan"
-Featured_Video = "video Unggulan"
-Featured_Image = "gambar Unggulan"
-Featured_Quote = "kutipan Unggulan"
-Featured_Link = "tautan Unggulan"
-Content = "konten"
-Preview = "lihat"
-Enter_image_URL = "masukkan URL gambar"
-Upload = "unggah"
-Insert_Image = "sisipkan gambar"
+Only = "Hanya"
+Featured_Audio = "Audio Unggulan"
+Featured_Video = "Video Unggulan"
+Featured_Image = "Gambar Unggulan"
+Featured_Quote = "Kutipan Unggulan"
+Featured_Link = "Tautan Unggulan"
+Content = "Konten"
+Preview = "Lihat"
+Enter_image_URL = "Masukkan URL gambar"
+Upload = "Unggah"
+Insert_Image = "Sisipkan gambar"
 This_page_doesnt_exist = "Halaman ini tidak ada!"
 Would_you_like_to_try_our = "Apakah Anda ingin mencoba "
-homepage = "beranda"
-instead = "sebagai gantinya"
+homepage = "Beranda"
+instead = "Sebagai gantinya"
 Your_backups = "Cadangan Anda"
-Create_backup = "Membuat cadanga"
+Create_backup = "Membuat cadangan"
 All_cache_has_been_deleted = "Cache telah dihapus!"
-Edit_category = "ubah kategoru"
-Date = "tanggal"
-Time = "jam"
+Edit_category = "Ubah kategori"
+Date = "Tanggal"
+Time = "Jam"
 No_available_backup = "Tidak ada cadangan yang tersedia saat ini."
 You_dont_have_permission_to_access_this_page = "Anda tidak memiliki izin untuk mengakses halaman ini"
-Save_category = "simpan kategori"
+Save_category = "Simpan kategori"
 Import_RSS_Feed_2.0 = "Impor RSS Feed 2.0"
 By_using_this_importer_you_are_agree_if_the_feed_is_yours_or_at_least_you_have_the_authority_to_publish_it = "Dengan menggunakan importir ini Anda setuju jika feed adalah milik Anda atau setidaknya Anda memiliki kewenangan untuk mempublikasikannya."
 Feed_Url = "URL umpan"
 Add_source_link_optional = "Tambahkan link sumber (opsional)"
 Import_Feed = "Mulai Impor Umpan"
 At_the_moment_you_are_using_auto_generated_menu = "Saat ini Anda menggunakan menu yang dibuat secara otomatis."
-Add_menu = "tambah menu"
+Add_menu = "Tambah menu"
 Name = "Nama"
 Link_name = "Nama tautan"
 Slug = "Slug"
 item_slug = "Sisipkan URL Tautan"
 CSS_Class_Optional = "CSS Class (opsional)"
-item_class = "sisipkan CSS class"
+item_class = "Sisipkan CSS class"
 Add_link = "Tambahkan link"
 Save_Edit = "Simpan Edit"
 Save_Menu = "Simpan menu"
@@ -152,14 +152,14 @@ Add_new_page = "Tambahkan halaman baru"
 Update_Available = "Pembaruan tersedia"
 Congrats_You_have_the_latest_version_of_HTMLy = "Selamat! Anda memiliki HTMLy versi terbaru."
 Update_to = "Perbarui ke"
-now= "sekarang"
+now= "Sekarang"
 Performance_Settings = "Pengaturan Performa"
 General = "Umum"
 Reading = "Bacaan"
 Widget = "Widget"
 Metatags = "Metatag"
 Performance = "Performa"
-Custom = "kustom"
+Custom = "Kustom"
 General_Settings = "Pengaturan Umum"
 Reading_Settings = "Pengaturan Membaca"
 Widget_Settings = "Pengaturan Widget"
@@ -173,10 +173,10 @@ Tagline_Placeholder="Platform Blogging PHP Tanpa Data"
 Tagline_description="Secara singkat, jelaskan tentang apa blog ini."
 Blog_Description="Dalam satu paragraf, ceritakan lebih banyak tentang blog Anda."
 Language="Bahasa Sistem"
-Timezone="zona waktu"
+Timezone="Zona waktu"
 Date_Format="Format tanggal"
 Blog_Theme="Tema"
-Copyright_Line="hak cipta"
+Copyright_Line="Hak cipta"
 Copyright_Line_Placeholder="(c) Nama Anda."
 Save_Config="Simpan konfigurasi"
 Front_page_displays="Tampilan halaman depan"
@@ -192,12 +192,12 @@ Summary_character="Karakter ringkasan"
 Read_more_text="Baca lebih banyak teks"
 Read_more_text_placeholder="Baca lebih banyak"
 Posts_index_settings="Pengaturan indeks artikel"
-Posts_in_category_page_at_most="artikel dalam halaman kategori paling banyak"
-Posts_in_archive_page_at_most="artikel di halaman arsip paling banyak"
-Posts_in_tag_page_at_most="artikel paling banyak di halaman tag"
-Posts_in_search_result_at_most="artikel dalam hasil pencarian paling banyak"
-Posts_in_type_page_at_most="artikel dalam halaman tipe paling banyak"
-Posts_in_profile_page_at_most="artikel di halaman profil paling banyak"
+Posts_in_category_page_at_most="Artikel dalam halaman kategori paling banyak"
+Posts_in_archive_page_at_most="Artikel di halaman arsip paling banyak"
+Posts_in_tag_page_at_most="Artikel paling banyak di halaman tag"
+Posts_in_search_result_at_most="Artikel dalam hasil pencarian paling banyak"
+Posts_in_type_page_at_most="Artikel dalam halaman tipe paling banyak"
+Posts_in_profile_page_at_most="Artikel di halaman profil paling banyak"
 RSS_settings="Pengaturan RSS"
 RSS_feeds_show_the_most_recent="Umpan RSS menunjukkan yang terbaru"
 RSS_character="Karakter RSS"
@@ -213,7 +213,7 @@ pro_tips_You_can_creating_custom_config_key_and_print_out_your_config_key_value_
 your_key="kunci.anda"
 Your_New_Config_Key="Kunci Konfigurasi Baru Anda"
 Your_New_Value="Nilai Baru Anda"
-Related_widget_posts_at_most="artikel widget terkait paling banyak"
+Related_widget_posts_at_most="Artikel widget terkait paling banyak"
 Recent_posts_widget_at_most="Widget artikel terbaru paling banyak"
 Popular_posts_widget="Widget artikel populer"
 Popular_posts_widget_at_most="Widget artikel populer paling banyak"
@@ -249,7 +249,7 @@ Pre_release="Pra-rilis"
 Yes_Im_in="Ya, saya ikut"
 Nope="Nggak"
 Page="Halaman"
-of="dari"
+of="Dari"
 Edit_post="Ubah"
 View_post="Lihat"
 Posts_by="Posts by"
@@ -269,4 +269,4 @@ Author_Description="Just another HTMLy user"
 Search_results_not_found="Search results not found!"
 No_search_results="No search results"
 ;TagCloud
-Tagcloud_widget_at_most = "TagCloud at most"
+Tagcloud_widget_at_most = "TagCloud paling banyak"
diff --git a/system/admin/views/categories.html.php b/system/admin/views/categories.html.php
index d034387..0ef8b20 100644
--- a/system/admin/views/categories.html.php
+++ b/system/admin/views/categories.html.php
@@ -19,7 +19,7 @@
     </tr>
     <?php foreach ($desc as $d):?>
     <tr>
-        <td><a href="<?php echo site_url();?>/admin/categories/<?php echo $d->md;?>"><?php echo $d->title;?></a></td>
+        <td><a href="<?php echo site_url();?>admin/categories/<?php echo $d->md;?>"><?php echo $d->title;?></a></td>
         <td><?php echo $d->body;?></td>
         <td><?php $total = get_draftcount($d->md) + get_categorycount($d->md); echo $total?></td>
         <td><a class="btn btn-primary btn-xs" href="<?php echo $d->url;?>/edit?destination=admin/categories"><?php echo i18n('Edit');?></a> <?php if (get_categorycount($d->md) == 0 && get_draftcount($d->md) == 0 ){echo '<a class="btn btn-danger btn-xs" href="' . $d->url . '/delete?destination=admin/categories">' . i18n('Delete') . '</a>';}?></td>
diff --git a/system/htmly.php b/system/htmly.php
index 0e17ab2..93c75a5 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -1667,7 +1667,7 @@ get('/admin/categories/:category', function ($category) {
                 $perpage = 10;    
             }
 
-            $posts = get_category($category, $page, $perpage);
+            $posts = get_category($category, $page, $perpage, false);
             
             $desc = get_category_info($category);
             
@@ -1731,7 +1731,7 @@ get('/category/:category', function ($category) {
         $perpage = 10;    
     }
 
-    $posts = get_category($category, $page, $perpage);
+    $posts = get_category($category, $page, $perpage, false);
     
     $desc = get_category_info($category);
     
diff --git a/system/includes/functions.php b/system/includes/functions.php
index f2f8f69..f33b675 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -270,6 +270,8 @@ function get_posts($posts, $page = 1, $perpage = 0)
             $category = default_category();
             $post->category = '<a href="' . $category->url . '">' . $category->title . '</a>';
             $post->categoryUrl = $category->url;
+            $post->categorySlug = $category->slug;
+            $post->categoryTitle = $category->title;
             $post->categoryb = '<a itemprop="item" href="' . $category->url . '"><span itemprop="name">' . $category->title . '</span></a>';
         } else {
 
@@ -277,6 +279,8 @@ function get_posts($posts, $page = 1, $perpage = 0)
                 if ($v['0'] === $str[count($str) - 3]) {
                     $post->category = '<a href="' . site_url() . 'category/' . $v['0'] . '">' . $v['1'] . '</a>';
                     $post->categoryUrl = site_url() . 'category/' . $v['0'];
+                    $post->categorySlug = $v['0'];
+                    $post->categoryTitle = $v['1'];
                     $post->categoryb = '<a itemprop="item" href="' . site_url() . 'category/' . $v['0'] . '"><span itemprop="name">' . $v['1'] . '</span></a>';
                 }
             }
@@ -362,7 +366,7 @@ function get_posts($posts, $page = 1, $perpage = 0)
 
         $post->tagb = implode(' » ', $bc);
 
-        $post->related = rtrim($arr[1], ',');
+        $post->related = $post->categorySlug. ',' .$post->url;
 
         $more = explode('<!--more-->', $content);
         if (isset($more['1'])) {
@@ -483,9 +487,13 @@ function find_draft($year, $month, $name)
 }
 
 // Return category page.
-function get_category($category, $page, $perpage)
+function get_category($category, $page, $perpage, $random)
 {
     $posts = get_post_sorted();
+	
+    if ($random === true) {
+        shuffle($posts);
+    }
 
     $tmp = array();
 
@@ -577,6 +585,7 @@ function default_category()
 
     $desc->title = i18n("Uncategorized");
     $desc->url = site_url() . 'category/uncategorized';
+    $desc->slug = 'uncategorized';
     $desc->body = '<p>Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.</p>';
 
     $desc->description = 'Topics that don&#39;t need a category, or don&#39;t fit into any other existing category.';
@@ -976,7 +985,7 @@ function get_keyword($keyword, $page, $perpage)
 
 }
 
-// Get related posts base on post tag.
+// Get related posts base on post category.
 function get_related($tag, $custom = null, $count = null)
 {
 
@@ -987,13 +996,11 @@ function get_related($tag, $custom = null, $count = null)
         }
     }
 
-    $posts = get_tag($tag, 1, $count + 1, true);
-    $tmp = array();
-    $req = urldecode($_SERVER['REQUEST_URI']);
+    $exp = explode(',', $tag);
+    $posts = get_category($exp[0], 1, $count + 1, true);
 
     foreach ($posts as $post) {
-        $url = $post->url;
-        if (stripos($url, $req) === false) {
+        if ($post->url !== $exp[1]) {
             $tmp[] = $post;
         }
     }