diff --git a/css/html_instruct_style.css b/css/html_instruct_style.css
index 6dee0a89..a7532cf6 100644
--- a/css/html_instruct_style.css
+++ b/css/html_instruct_style.css
@@ -19,12 +19,14 @@
     color: #d1d5db !important;
 }
 
-.chat .message-body :is(th, td) {
+.chat .message-body :is(th, td),
+.prose hr {
     border-color: #40404096 !important;
 }
 
-.dark .chat .message-body :is(th, td) {
-    border-color: #ffffff75 !important;
+.dark .chat .message-body :is(th, td),
+.dark .prose hr {
+    border-color: rgba(255, 255, 255, 0.3) !important;
 }
 
 .chat .message-body :is(p, ul, ol) {
diff --git a/css/main.css b/css/main.css
index e7586960..376cfa6d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1797,3 +1797,20 @@ button#swap-height-width {
     top: 0;
     left: calc(100% - 174px);
 }
+
+table {
+  border-collapse: collapse;
+}
+
+table, tr, td, th, thead {
+  border: 0;
+}
+
+td + td,
+th + th { border-left: 1px solid; }
+
+tr + tr td,
+tr + tr th { border-top: 1px solid; }
+
+thead + tbody tr:first-child td,
+thead + tbody tr:first-child th { border-top: 1px solid; }
diff --git a/modules/models_settings.py b/modules/models_settings.py
index e9f19a06..15ff2830 100644
--- a/modules/models_settings.py
+++ b/modules/models_settings.py
@@ -83,7 +83,11 @@ def get_model_metadata(model):
 
         if 'tokenizer.chat_template' in metadata:
             template = metadata['tokenizer.chat_template']
-            eos_token = metadata['tokenizer.ggml.tokens'][metadata['tokenizer.ggml.eos_token_id']]
+            if 'tokenizer.ggml.eos_token_id' in metadata:
+                eos_token = metadata['tokenizer.ggml.tokens'][metadata['tokenizer.ggml.eos_token_id']]
+            else:
+                eos_token = ""
+
             if 'tokenizer.ggml.bos_token_id' in metadata:
                 bos_token = metadata['tokenizer.ggml.tokens'][metadata['tokenizer.ggml.bos_token_id']]
             else: