diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 66635f7..4a819a3 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -128,20 +128,6 @@ return {
     })
     require("cmp_git").setup({})
 
-    -- Customise LSP UI
-    vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
-      vim.lsp.handlers.hover, {
-        border = 'rounded',
-        title = 'Hover',
-      }
-    )
-    vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
-      vim.lsp.handlers.signature_help, {
-        border = 'rounded',
-        title = 'Signature Help',
-      }
-    )
-
     -- Mappings created when LSP is attached to a buffer
     local augroup = vim.api.nvim_create_augroup('lsp', { clear = true })
     vim.api.nvim_create_autocmd('LspAttach', {
diff --git a/lua/plugins/diagnostics.lua b/lua/plugins/diagnostics.lua
index aed0714..32da0a6 100644
--- a/lua/plugins/diagnostics.lua
+++ b/lua/plugins/diagnostics.lua
@@ -11,13 +11,6 @@ return {
         require('trouble').toggle()
       end, { remap = false })
 
-      vim.diagnostic.config({
-        float = {
-          border = 'rounded', -- Enable rounded border on floats
-        },
-        virtual_text = false, -- Disable trailing virtual text
-      })
-
       vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { remap = false })
       vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { remap = false })
       vim.keymap.set('n', '<leader>sd', vim.diagnostic.open_float, { remap = false })
diff --git a/lua/ui.lua b/lua/ui.lua
new file mode 100644
index 0000000..65ad738
--- /dev/null
+++ b/lua/ui.lua
@@ -0,0 +1,21 @@
+-- Customise LSP UI
+vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
+  vim.lsp.handlers.hover, {
+    border = 'rounded',
+    title = 'Hover',
+  }
+)
+vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
+  vim.lsp.handlers.signature_help, {
+    border = 'rounded',
+    title = 'Signature Help',
+  }
+)
+
+-- Customise diagnostic UI
+vim.diagnostic.config({
+  float = {
+    border = 'rounded',
+  },
+  virtual_text = false,
+})