diff --git a/init.el b/init.el
index 1dac20c..d20b1a8 100644
--- a/init.el
+++ b/init.el
@@ -1308,15 +1308,17 @@ like a dumbass."
         circe-format-action
         (lambda (&rest plist)
           (concat
-           (acdw-irc/margin-format (plist-get plist :nick) "*" " *" t)
+           (acdw-irc/margin-format "" "*" "*" t)
            " "
+           (plist-get plist :nick) " "
            (plist-get plist :body)))
 
         circe-format-self-action
         (lambda (&rest plist)
           (concat
-           (acdw-irc/margin-format (plist-get plist :nick) "-*" " *" t)
+           (acdw-irc/margin-format "" "-*" " *" t)
            " "
+           (plist-get plist :nick) " "
            (plist-get plist :body)))
 
         lui-fill-type (repeat-string acdw-irc/left-margin " "))
@@ -1335,7 +1337,8 @@ like a dumbass."
                           word-wrap t
                           wrap-prefix (repeat-string
                                        acdw-irc/left-margin " ")
-                          line-number-mode nil))))
+                          line-number-mode nil)
+              (enable-lui-track))))
 
 (setup (:straight crux)