diff --git a/src/gptContext.js b/src/gptContext.js
index e89a76c..ab05ad5 100644
--- a/src/gptContext.js
+++ b/src/gptContext.js
@@ -39,7 +39,7 @@ async function handleQuestionSubmission(panel, question, selectedUris) {
         const chatCompletion = await openai.createChatCompletion({
             model: "gpt-3.5-turbo-16k",
             messages: [
-                { role: "system", content: "Answer the coding questions, only provide the code and documentation, explaining the solution after providing the code." },
+                { role: "system", content: "Answer the coding questions, only provide the code and documentation, explaining the solution after providing the code. Put codeblocks inside ``` code ``` with file names above each snippet." },
                 { role: "user", content: question + "\n" + fileContents},
             ],
         });
diff --git a/src/webviewPanel.js b/src/webviewPanel.js
index c20db73..2764908 100644
--- a/src/webviewPanel.js
+++ b/src/webviewPanel.js
@@ -304,13 +304,19 @@ function getWebviewContent(apiResponse = '', question = '') {
                 </div>
                 <div class="content" id="api-response">
                     <div id="question-rep">
-                        <p>${question ? '> ' + question : null}</p>
+                        <p>${
+                            question = question.replace(/</g, '&lt;').replace(/>/g, '&gt;'),
+                            question ? '> ' + question : null
+                        }</p>
                     </div>
                     ${
                     apiResponse ? `
                     <div id="rendered">
                         <p id="responses">
-                            <pre id="response">${apiResponse.replace(/```([^```]+)```/g, '<div  id="code-block"><code>$1</code><button onclick="copyCode(event)" id="copy-button">copy</button></div>')}</pre>
+                            <pre id="response">${
+                                apiResponse = apiResponse.replace(/</g, '&lt;').replace(/>/g, '&gt;'),
+                                apiResponse.replace(/```([^```]+)```/g, '<div  id="code-block"><code>$1</code><button onclick="copyCode(event)" id="copy-button">copy</button></div>')
+                            }</pre>
                         </p>
                     </div>
                     ` : null