diff --git a/assets/build/convImages.sh b/assets/build/convImages.sh
index dcafafb..9689030 100755
--- a/assets/build/convImages.sh
+++ b/assets/build/convImages.sh
@@ -20,12 +20,12 @@ for FILE in public/**/*.@(jpg|jpeg|tif|tiff|png|gif); do
     NAME=$(basename "$FILE" | cut -d. -f1)
     EXTENSION=$(basename "$FILE" | cut -d. -f2)
     for size in ${sizes[@]}; do
-        magick convert "$FILE" -resize ${size}x${size}\> "${DIR}/${NAME}-${size}.${EXTENSION}" 
+        convert "$FILE" -resize ${size}x${size}\> "${DIR}/${NAME}-${size}.${EXTENSION}" 
     done
 done
 
 # Web Optimized Formats
 for FILE in public/**/*.@(jpg|jpeg|tif|tiff|png|gif); do 
-    magick convert $PARAMS "$FILE" "${FILE}".webp;
-    magick convert $PARAMS "$FILE" "${FILE}".avif;
-done
+    convert $PARAMS "$FILE" "${FILE}".webp;
+    convert $PARAMS "$FILE" "${FILE}".avif;
+done
\ No newline at end of file
diff --git a/assets/build/genIco.sh b/assets/build/genIco.sh
index c5feb8f..e3e9fb0 100644
--- a/assets/build/genIco.sh
+++ b/assets/build/genIco.sh
@@ -6,4 +6,4 @@
 # 1. The path of the source file
 # 2. The output path (with .ico extension)
 
-magick convert -density 300 -define icon:auto-resize=96,64,48,32,16 -background none $1 $2
+convert -density 300 -define icon:auto-resize=96,64,48,32,16 -background none $1 $2
diff --git a/assets/scss/index.scss b/assets/scss/index.scss
index ec015fe..c1538c5 100644
--- a/assets/scss/index.scss
+++ b/assets/scss/index.scss
@@ -207,30 +207,25 @@ img {
 .team {
   align-items: center;
   text-align: center;
-  .list {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    gap: 2rem;
-    justify-content: center;
-    a {
-      color: inherit;
-      margin: 0 auto;
-      .member {
-        display: inline-block;
-        align-items: center;
-        text-align: center;
-        padding: 1rem;
-        .title {
-          font-size: x-large;
-          padding-bottom: 0.1rem;
-          text-align: center;
-        }
-      }
-    }
+}
+
+.team-list {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  a {
+    color: inherit;
+    margin: 0 auto;
   }
 }
 
+.teammember {
+  display: inline-block;
+  align-items: center;
+  text-align: center;
+  padding: 1rem;
+}
+
 .avatar {
   width: 15rem;
   height: 15rem;
diff --git a/layouts/partials/team.html b/layouts/partials/team.html
index 758b3c9..402f557 100644
--- a/layouts/partials/team.html
+++ b/layouts/partials/team.html
@@ -8,13 +8,11 @@
 {{else if .id}}
     {{- $id = .id }}
 {{end}}
-{{- $members := where $pages "Params.leaveDate" "==" nil}}
-{{- $first := $team.first | default 4}}
 <div id="{{ $id }}" class="section {{if eq $odd 0}} section-even {{end}}">
     <div class="section-content team">
         {{ partial "components/title.html" $team.title }}
         <div class="list">
-            {{- range first $first ($members.ByParam "startDate") }}
+            {{- range first 4 ((where $pages "Params.leaveDate" "==" nil).ByParam "startDate") }}
             <a href="{{.Permalink}}">
                 <div class="member">
                     {{ if .Params.image }}
@@ -22,7 +20,7 @@
                     {{ else }}
                         {{- partial "components/image.html" (dict "style" "avatar" "url" $defaultimage "alt" "Placeholder") -}}
                     {{ end }}
-                    <h1 class="title">{{ .Params.name }}</h1>
+                    <h1 class="teammember-title">{{ .Params.name }}</h1>
                     {{- range .Params.jobs }}
                     <p>{{ . }}</p>
                     {{- end }}
@@ -41,8 +39,6 @@
             </a>
             {{- end }}
         </div>
-        {{ if gt $members.Len $first }}
-          {{ partial "components/button.html" (dict "type" "text block" "url" $team.id "text" ($team.more | default "More")) }}
-        {{ end }}
+        {{ partial "components/button.html" (dict "type" "text block" "url" $team.id "text" ($team.more | default "More")) }}
     </div>
 </div>
diff --git a/layouts/team/list.html b/layouts/team/list.html
index f72389c..27c0ad1 100644
--- a/layouts/team/list.html
+++ b/layouts/team/list.html
@@ -1,19 +1,19 @@
 {{ define "main" }}
-<div class="team content">
+<div class="content">
     <article>
         {{ partial "components/title.html" .Title }}
         {{.Content}}
     </article>
-    <div class="list">
+    <div class="team-list">
         {{ range (where .Pages "Params.leaveDate" "==" nil).ByParam "startDate" }}
         <a href="{{.Permalink}}">
-            <div class="member">
+            <div class="teammember">
                 {{ if .Params.image }}
                     {{- partial "components/image.html" (dict "style" "avatar" "url" .Params.image "alt" .Params.name) -}}
                 {{ else }}
                     {{- partial "components/image.html" (dict "style" "avatar" "url" $.Site.Params.defaultimage "alt" "Placeholder") -}}
                 {{ end }}
-                <h1 class="title">{{ .Params.name }}</h1>
+                <h1 class="teammember-title">{{ .Params.name }}</h1>
                 {{- range .Params.jobs }}
                     <p>{{ . }}</p>
                 {{- end }}