diff --git a/app/backend/ChatHistory.ts b/app/backend/ChatHistory.ts
index dc12cb1..918d2da 100644
--- a/app/backend/ChatHistory.ts
+++ b/app/backend/ChatHistory.ts
@@ -14,6 +14,7 @@ function addMessageToHistory(name: string, message: any): void {
     };
     chatHistory.push(newMessage);
     console.log(`Added message from ${name}: ${message}`);
+    chatHistory.sort((a,b) => b.timestamp - a.timestamp)
 }
 
 function removeMessageFromHistory(timestamp: number): void {
diff --git a/app/backend/InputOutputHandler.tsx b/app/backend/InputOutputHandler.tsx
index 6201ca9..c584cb9 100644
--- a/app/backend/InputOutputHandler.tsx
+++ b/app/backend/InputOutputHandler.tsx
@@ -47,10 +47,8 @@ const InputOutputBackend: React.FC = () => {
       The currency is ${preferredCurrency}. 
       Communicate in the language specified by the user (country code: ${preferredLanguage}), and only in this language.
       You are only able to change language if the user specifically states you must. 
-      Do not answer in multiple languages or multiple measurement systems under any circumstances other than the user requesting it.
-      You try to use html tags as often as possible in your responses. For images, links and tables you use markdown.`
-      : `You are a helpful assistant
-      You try to use html tags as often as possible in your responses. For images, links and tables you use markdown. You cannot use both at the same time.`;
+      Do not answer in multiple languages or multiple measurement systems under any circumstances other than the user requesting it.`
+      : `You are a helpful assistant`;
     setMessages([
       { role: "system", content: systemMessage },
       { role: "assistant", content: "Hello! How may I help you?" },
diff --git a/app/components/settings/Settings.tsx b/app/components/settings/Settings.tsx
index 0d77b0b..ad1c21e 100644
--- a/app/components/settings/Settings.tsx
+++ b/app/components/settings/Settings.tsx
@@ -516,6 +516,19 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
                   setValue={setBasicTextColor}
                   cssVariable=""
                 />
+                <FontSizeSetting
+                  fontSize={fontSize}
+                  setFontSize={setFontSize}
+                />
+                <DropdownSetting
+                  label="Font Family"
+                  value={fontFamily}
+                  setValue={(newFont) => {
+                    setFontFamily(newFont);
+                    document.documentElement.style.setProperty('--font-family', newFont);
+                  }}
+                  options={fontOptions}
+                />
               </>
             )}
 
diff --git a/app/components/settings/theme.ts b/app/components/settings/theme.ts
index 2cef5cc..75c1c40 100644
--- a/app/components/settings/theme.ts
+++ b/app/components/settings/theme.ts
@@ -247,8 +247,8 @@ export const applyBasicCustomTheme = (
   document.documentElement.style.setProperty('--popup-background-color', accentColor);
   document.documentElement.style.setProperty('--pop-up-text', lightenColor(textColor, 80));
   document.documentElement.style.setProperty('--input-border-color', primaryColor);
-  document.documentElement.style.setProperty('--font-family', "'Poppins', 'sans-serif'");
-  document.documentElement.style.setProperty('--font-size', '16px');
+  document.documentElement.style.setProperty('--font-family', localStorage.getItem("fontFamily") || "'Poppins', 'sans-serif'");
+  document.documentElement.style.setProperty('--font-size', localStorage.getItem("fontSize") || '16px');
 };
 
 // Helper function to darken a color (returns a darker version of the provided color)
diff --git a/app/styles/output.css b/app/styles/output.css
index 09e1f09..320b68b 100644
--- a/app/styles/output.css
+++ b/app/styles/output.css
@@ -84,7 +84,7 @@
 
 .ai-message code{
     width: 100%;
-    overflow-wrap: break-word;
+    overflow: scroll;
 }
 
 /* Button Container */