diff --git a/src/func.less b/src/func.less
index d3cef81..54a790c 100644
--- a/src/func.less
+++ b/src/func.less
@@ -29,3 +29,18 @@
   height:  0    !important;
 }
 
+.horiz-tab(@cols: 2, @offset: 0) {
+  @gap: @div-width * 2;
+  @el-width: calc(unit((100% / @cols), %) - unit((@gap + @offset), px));
+  display: flex;
+  flex-flow: row wrap;
+  column-gap: @gap;
+  row-gap: (@gap / 2);
+  & > * {
+    width: @el-width;
+  }
+
+  div[class^="divider"]:empty {
+    display: none;
+  }
+}
diff --git a/src/hide.less b/src/hide.less
index b8bc2b5..6753329 100644
--- a/src/hide.less
+++ b/src/hide.less
@@ -18,16 +18,7 @@ div[class^="art-"],
 { &:extend(.hide); }
 
 // Nicks
-[class^="username-"] {
-  li[class^="messageListItem-"]
-   [class*="cozyMessage-"] &,   // inside message
-  :not([class^="headerText-"])
-   > div[class*="nameTag-"] &, // outside message
-  { &:extend(.hide); }
-}
-
 [class^="discrimBase-"],
-div[class^="discordTag-"] [class^="username-"], // friends tab
 div[class^="nameTag-"],
 [class^="usernameInnerRow-"], // at settings
 { &:extend(.hide); }
diff --git a/src/people.less b/src/people.less
index fa78fd3..ad02e99 100644
--- a/src/people.less
+++ b/src/people.less
@@ -20,3 +20,19 @@
     margin-left: 0;
   }
 }
+
+span[class^="username-"] {
+  font-weight: 500;
+}
+
+// friends tab
+div[class^="peopleList-"] > div {
+  @margin: 4px;
+
+  & > *, & > *:hover {
+    border: none;
+    padding: 8px !important;
+    margin: @margin !important;
+  }
+  .horiz-tab(2, @margin * 2);
+}
diff --git a/src/profile.less b/src/profile.less
index a182e8c..4d176ad 100644
--- a/src/profile.less
+++ b/src/profile.less
@@ -72,6 +72,9 @@ div[class^="pencilContainer-"] {
 
 // Profile card in settings
 div[class^="accountProfileCard-"] {
+  span[class^="username-"]
+  { &:extend(.hide); }
+
   div[class^="field-"]:nth-child(1) {
     height: 0;
     div[class^="constrainedRow-"] {
@@ -110,6 +113,9 @@ header div[class^="nameTagNoCustomStatus-"] {
 div.root-8LYsGj { // I not love fixed classes, but this selects only modal page
   flex-direction: row;
 
+  span[class^="username-"]
+  { &:extend(.hide); }
+
   header {
     width: 260px;
     margin: 24px;
diff --git a/src/settings.less b/src/settings.less
index 5df8592..c991faa 100644
--- a/src/settings.less
+++ b/src/settings.less
@@ -62,22 +62,6 @@ div[aria-controls="analytics-tab"],
 div[aria-controls="partner-tab"],
 { &:extend(.hide); }
 
-.horiz-tab(@cols: 2) {
-  @gap: @div-width * 2;
-  @el-width: calc(100% / @cols - @gap);
-  display: flex;
-  flex-flow: row wrap;
-  column-gap: @gap;
-  row-gap: (@gap / 2);
-  & > * {
-    width: @el-width;
-  }
-
-  div[class^="divider"]:empty {
-    display: none;
-  }
-}
-
 #my-account-tab > div {
   .horiz-tab();
   & > div:first-child {