diff --git a/UnleashedRecomp/ui/imgui_utils.cpp b/UnleashedRecomp/ui/imgui_utils.cpp
index 41d82ffa..2bed3eda 100644
--- a/UnleashedRecomp/ui/imgui_utils.cpp
+++ b/UnleashedRecomp/ui/imgui_utils.cpp
@@ -381,7 +381,7 @@ std::pair<std::string, std::map<std::string, std::string>> RemoveRubyAnnotations
     return { output, rubyMap };
 }
 
-std::string ReAddRubyAnnotations(const std::string& wrappedText, const std::map<std::string, std::string>& rubyMap) {
+std::string ReAddRubyAnnotations(const std::string_view& wrappedText, const std::map<std::string, std::string>& rubyMap) {
     std::string annotatedText;
     size_t idx = 0;
     size_t length = wrappedText.length();
@@ -392,7 +392,12 @@ std::string ReAddRubyAnnotations(const std::string& wrappedText, const std::map<
         {
             if (wrappedText.substr(idx, mainText.length()) == mainText) 
             {
-                annotatedText += "[" + mainText + ":" + rubyText + "]";
+                annotatedText += "[";
+                annotatedText += mainText;
+                annotatedText += ":";
+                annotatedText += rubyText;
+                annotatedText += "]";
+
                 idx += mainText.length();
                 matched = true;
                 break;
@@ -543,9 +548,9 @@ Paragraph CalculateAnnotatedParagraph(const std::vector<std::string>& lines)
 std::vector<std::string> RemoveAnnotationFromParagraph(const std::vector<std::string>& lines)
 {
     std::vector<std::string> result;
-    const auto& annotatedLines = CalculateAnnotatedParagraph(lines).lines;
+    const auto paragraph = CalculateAnnotatedParagraph(lines);
 
-    for (auto& annotatedLine : annotatedLines)
+    for (auto& annotatedLine : paragraph.lines)
     {
         std::string annotationRemovedLine = "";
         for (const auto& segment : annotatedLine)
@@ -576,10 +581,10 @@ ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float lineMar
     auto x = 0.0f;
     auto y = 0.0f;
 
-    const auto& annotatedLines = CalculateAnnotatedParagraph(lines);
+    const auto paragraph = CalculateAnnotatedParagraph(lines);
     
     std::vector<std::string> annotationRemovedLines;
-    for (const auto& line : annotatedLines.lines)
+    for (const auto& line : paragraph.lines)
     {
         annotationRemovedLines.emplace_back(RemoveAnnotationFromParagraphLine(line));
     }
@@ -594,7 +599,7 @@ ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float lineMar
         x = std::max(x, textSize.x);
         y += textSize.y + Scale(lineMargin);
 
-        if (annotatedLines.annotated)
+        if (paragraph.annotated)
         {
             y += annotationSize.y;
         }
@@ -612,7 +617,7 @@ void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, c
 {
     float annotationFontSize = fontSize * ANNOTATION_FONT_SIZE_MODIFIER;
 
-    const auto& input = RemoveRubyAnnotations(text);
+    const auto input = RemoveRubyAnnotations(text);
     auto lines = Split(input.first.c_str(), font, fontSize, maxWidth);
 
     for (auto& line : lines)
@@ -623,11 +628,11 @@ void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, c
     auto paragraphSize = MeasureCentredParagraph(font, fontSize, lineMargin, lines);
     float offsetY = 0.0f;
 
-    const auto& annotatedLines = CalculateAnnotatedParagraph(lines);
+    const auto paragraph = CalculateAnnotatedParagraph(lines);
 
-    for (const auto& annotatedLine : annotatedLines.lines)
+    for (const auto& annotatedLine : paragraph.lines)
     {
-        const auto& annotationRemovedLine = RemoveAnnotationFromParagraphLine(annotatedLine);
+        const auto annotationRemovedLine = RemoveAnnotationFromParagraphLine(annotatedLine);
 
         auto textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, annotationRemovedLine.c_str());
         auto annotationSize = font->CalcTextSizeA(annotationFontSize, FLT_MAX, 0, "");
@@ -661,7 +666,7 @@ void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, c
         }
 
         offsetY += textSize.y + Scale(lineMargin);
-        if (annotatedLines.annotated)
+        if (paragraph.annotated)
         {
             offsetY += annotationSize.y;
         }
diff --git a/UnleashedRecomp/ui/imgui_utils.h b/UnleashedRecomp/ui/imgui_utils.h
index 300f22f8..f664700b 100644
--- a/UnleashedRecomp/ui/imgui_utils.h
+++ b/UnleashedRecomp/ui/imgui_utils.h
@@ -62,7 +62,7 @@ void DrawTextWithShadow(const ImFont* font, float fontSize, const ImVec2& pos, I
 float CalcWidestTextSize(const ImFont* font, float fontSize, std::span<std::string> strs);
 std::string Truncate(const std::string& input, size_t maxLength, bool useEllipsis = true, bool usePrefixEllipsis = false);
 std::pair<std::string, std::map<std::string, std::string>> RemoveRubyAnnotations(const char* input);
-std::string ReAddRubyAnnotations(const std::string& wrappedText, const std::map<std::string, std::string>& rubyMap);
+std::string ReAddRubyAnnotations(const std::string_view& wrappedText, const std::map<std::string, std::string>& rubyMap);
 std::vector<std::string> Split(const char* strStart, const ImFont* font, float fontSize, float maxWidth);
 Paragraph CalculateAnnotatedParagraph(const std::vector<std::string>& lines);
 std::vector<std::string> RemoveAnnotationFromParagraph(const std::vector<std::string>& lines);
diff --git a/UnleashedRecomp/ui/message_window.cpp b/UnleashedRecomp/ui/message_window.cpp
index f9e2601f..8e562c77 100644
--- a/UnleashedRecomp/ui/message_window.cpp
+++ b/UnleashedRecomp/ui/message_window.cpp
@@ -273,7 +273,7 @@ void MessageWindow::Draw()
     auto maxWidth = Scale(820);
     auto fontSize = Scale(28);
 
-    const auto& input = RemoveRubyAnnotations(g_text.c_str());
+    const auto input = RemoveRubyAnnotations(g_text.c_str());
     auto lines = Split(input.first.c_str(), g_fntSeurat, fontSize, maxWidth);
     
     for (auto& line : lines)