diff --git a/pages/profile/profile.scarlet b/pages/profile/profile.scarlet
index f5ffbfaf..acfc4d23 100644
--- a/pages/profile/profile.scarlet
+++ b/pages/profile/profile.scarlet
@@ -67,7 +67,7 @@ animation cover-animation
 
 .image-container
 	flex 1
-	max-width 250px
+	max-width 275px
 
 .intro-container
 	vertical
diff --git a/pages/users/users.go b/pages/users/users.go
index a6cd8e35..cf98d1a1 100644
--- a/pages/users/users.go
+++ b/pages/users/users.go
@@ -2,6 +2,7 @@ package users
 
 import (
 	"net/http"
+	"sort"
 
 	"github.com/aerogo/aero"
 	"github.com/animenotifier/arn"
@@ -11,7 +12,11 @@ import (
 // Get ...
 func Get(ctx *aero.Context) string {
 	users, err := arn.FilterUsers(func(user *arn.User) bool {
-		return user.IsActive()
+		return user.IsActive() && user.Avatar != ""
+	})
+
+	sort.Slice(users, func(i, j int) bool {
+		return users[i].Registered < users[j].Registered
 	})
 
 	if err != nil {
diff --git a/pages/users/users.pixy b/pages/users/users.pixy
index b62fa142..4284669e 100644
--- a/pages/users/users.pixy
+++ b/pages/users/users.pixy
@@ -1,5 +1,6 @@
 component Users(users []*arn.User)
 	h2.page-title Users
 
-	each user in users
-		p= user.Nick
\ No newline at end of file
+	.user-avatars
+		each user in users
+			Avatar(user)
\ No newline at end of file
diff --git a/pages/users/users.scarlet b/pages/users/users.scarlet
new file mode 100644
index 00000000..54f094df
--- /dev/null
+++ b/pages/users/users.scarlet
@@ -0,0 +1,2 @@
+.user-avatars
+	horizontal-wrap
\ No newline at end of file