diff --git a/autogpt_platform/backend/backend/server/rest_api.py b/autogpt_platform/backend/backend/server/rest_api.py
index 1e2424c165..b1c1dcfbf5 100644
--- a/autogpt_platform/backend/backend/server/rest_api.py
+++ b/autogpt_platform/backend/backend/server/rest_api.py
@@ -17,13 +17,13 @@ import backend.data.db
 import backend.data.graph
 import backend.data.user
 import backend.server.integrations.router
+import backend.server.routers.postmark.postmark
 import backend.server.routers.v1
 import backend.server.v2.admin.store_admin_routes
 import backend.server.v2.library.db
 import backend.server.v2.library.model
 import backend.server.v2.library.routes
 import backend.server.v2.otto.routes
-import backend.server.v2.postmark.postmark
 import backend.server.v2.store.model
 import backend.server.v2.store.routes
 import backend.util.service
@@ -115,8 +115,8 @@ app.include_router(
 )
 
 app.include_router(
-    backend.server.v2.postmark.postmark.router,
-    tags=["v2", "email"],
+    backend.server.routers.postmark.postmark.router,
+    tags=["v1", "email"],
     prefix="/api/email",
 )
 
diff --git a/autogpt_platform/backend/backend/server/v2/postmark/__init__.py b/autogpt_platform/backend/backend/server/routers/postmark/__init__.py
similarity index 100%
rename from autogpt_platform/backend/backend/server/v2/postmark/__init__.py
rename to autogpt_platform/backend/backend/server/routers/postmark/__init__.py
diff --git a/autogpt_platform/backend/backend/server/v2/postmark/models.py b/autogpt_platform/backend/backend/server/routers/postmark/models.py
similarity index 100%
rename from autogpt_platform/backend/backend/server/v2/postmark/models.py
rename to autogpt_platform/backend/backend/server/routers/postmark/models.py
diff --git a/autogpt_platform/backend/backend/server/v2/postmark/postmark.py b/autogpt_platform/backend/backend/server/routers/postmark/postmark.py
similarity index 98%
rename from autogpt_platform/backend/backend/server/v2/postmark/postmark.py
rename to autogpt_platform/backend/backend/server/routers/postmark/postmark.py
index c6348c68a3..c9ceca4e91 100644
--- a/autogpt_platform/backend/backend/server/v2/postmark/postmark.py
+++ b/autogpt_platform/backend/backend/server/routers/postmark/postmark.py
@@ -10,7 +10,7 @@ from backend.data.user import (
     set_user_email_verification,
     unsubscribe_user_by_token,
 )
-from backend.server.v2.postmark.models import (
+from backend.server.routers.postmark.models import (
     PostmarkBounceEnum,
     PostmarkBounceWebhook,
     PostmarkClickWebhook,
diff --git a/autogpt_platform/frontend/src/components/agptui/CreatorInfoCard.tsx b/autogpt_platform/frontend/src/components/agptui/CreatorInfoCard.tsx
index ad8e614158..48916bce74 100644
--- a/autogpt_platform/frontend/src/components/agptui/CreatorInfoCard.tsx
+++ b/autogpt_platform/frontend/src/components/agptui/CreatorInfoCard.tsx
@@ -27,7 +27,12 @@ export const CreatorInfoCard: React.FC<CreatorInfoCardProps> = ({
     >
       <div className="flex w-full flex-col items-start justify-start gap-3.5 sm:h-[218px]">
         <Avatar className="h-[100px] w-[100px] sm:h-[130px] sm:w-[130px]">
-          <AvatarImage src={avatarSrc} alt={`${username}'s avatar`} />
+          <AvatarImage
+            width={130}
+            height={130}
+            src={avatarSrc}
+            alt={`${username}'s avatar`}
+          />
           <AvatarFallback className="h-[100px] w-[100px] sm:h-[130px] sm:w-[130px]">
             {username.charAt(0)}
           </AvatarFallback>
diff --git a/autogpt_platform/frontend/src/components/agptui/SearchBar.tsx b/autogpt_platform/frontend/src/components/agptui/SearchBar.tsx
index 5db58260f1..713ac0b075 100644
--- a/autogpt_platform/frontend/src/components/agptui/SearchBar.tsx
+++ b/autogpt_platform/frontend/src/components/agptui/SearchBar.tsx
@@ -44,7 +44,7 @@ export const SearchBar: React.FC<SearchBarProps> = ({
     <form
       onSubmit={handleSubmit}
       data-testid="store-search-bar"
-      className={`${width} ${height} px-4 py-2 md:px-6 md:py-1 ${backgroundColor} flex items-center justify-center gap-2 rounded-full md:gap-5`}
+      className={`${width} ${height} px-4 pt-2 md:px-6 md:pt-1 ${backgroundColor} flex items-center justify-center gap-2 rounded-full md:gap-5`}
     >
       <MagnifyingGlassIcon className={`h-5 w-5 md:h-7 md:w-7 ${iconColor}`} />
       <input
diff --git a/autogpt_platform/frontend/src/components/agptui/StoreCard.tsx b/autogpt_platform/frontend/src/components/agptui/StoreCard.tsx
index 28c29794aa..48274cb217 100644
--- a/autogpt_platform/frontend/src/components/agptui/StoreCard.tsx
+++ b/autogpt_platform/frontend/src/components/agptui/StoreCard.tsx
@@ -75,22 +75,22 @@ export const StoreCard: React.FC<StoreCardProps> = ({
       {/* Content Section */}
       <div className="w-full px-2 py-4">
         {/* Title and Creator */}
-        <h3 className="mb-0.5 font-poppins text-2xl font-semibold leading-tight text-[#272727] dark:text-neutral-100">
+        <h3 className="mb-0.5 font-poppins text-2xl font-semibold text-[#272727] dark:text-neutral-100">
           {agentName}
         </h3>
         {!hideAvatar && creatorName && (
-          <p className="font-lead mb-2.5 text-base font-normal text-neutral-600 dark:text-neutral-400">
+          <p className="mb-2.5 font-sans text-xl font-normal text-neutral-600 dark:text-neutral-400">
             by {creatorName}
           </p>
         )}
         {/* Description */}
-        <p className="font-geist mb-4 line-clamp-3 text-base font-normal leading-normal text-neutral-600 dark:text-neutral-400">
+        <p className="mb-4 font-sans text-base font-normal leading-normal text-neutral-600 dark:text-neutral-400">
           {description}
         </p>
 
         {/* Stats Row */}
         <div className="flex items-center justify-between">
-          <div className="font-geist text-lg font-semibold text-neutral-800 dark:text-neutral-200">
+          <div className="font-sans text-lg font-semibold text-neutral-800 dark:text-neutral-200">
             {runs.toLocaleString()} runs
           </div>
           <div className="flex items-center gap-2">
diff --git a/autogpt_platform/frontend/src/components/agptui/composite/AgentsSection.tsx b/autogpt_platform/frontend/src/components/agptui/composite/AgentsSection.tsx
index db8f08c44c..7adb364008 100644
--- a/autogpt_platform/frontend/src/components/agptui/composite/AgentsSection.tsx
+++ b/autogpt_platform/frontend/src/components/agptui/composite/AgentsSection.tsx
@@ -45,9 +45,9 @@ export const AgentsSection: React.FC<AgentsSectionProps> = ({
   };
 
   return (
-    <div className="flex flex-col items-center justify-center py-4 lg:py-8">
+    <div className="flex flex-col items-center justify-center pb-4 lg:pb-8">
       <div className="w-full max-w-[1360px]">
-        <div className="decoration-skip-ink-none mb-8 text-left font-poppins text-[18px] font-[600] leading-7 text-[#282828] underline-offset-[from-font] dark:text-neutral-200">
+        <div className="decoration-skip-ink-none mb-8 mt-[25px] text-left font-poppins text-[18px] font-[600] leading-7 text-[#282828] underline-offset-[from-font] dark:text-neutral-200">
           {sectionTitle}
         </div>
         {!displayedAgents || displayedAgents.length === 0 ? (
diff --git a/autogpt_platform/frontend/src/components/agptui/composite/HeroSection.tsx b/autogpt_platform/frontend/src/components/agptui/composite/HeroSection.tsx
index 7a28a04553..7fae3b88fb 100644
--- a/autogpt_platform/frontend/src/components/agptui/composite/HeroSection.tsx
+++ b/autogpt_platform/frontend/src/components/agptui/composite/HeroSection.tsx
@@ -36,7 +36,7 @@ export const HeroSection: React.FC = () => {
         <h3 className="mb:text-2xl mb-6 text-center font-sans text-xl font-normal leading-loose text-neutral-700 dark:text-neutral-300 md:mb-12">
           Bringing you AI agents designed by thinkers from around the world
         </h3>
-        <div className="mb-4 flex justify-center sm:mb-5 md:mb-6">
+        <div className="mb-4 flex justify-center sm:mb-5">
           <SearchBar height="h-[74px]" />
         </div>
         <div>
diff --git a/autogpt_platform/frontend/src/components/ui/carousel.tsx b/autogpt_platform/frontend/src/components/ui/carousel.tsx
index cf5ff95f20..8a391b5b39 100644
--- a/autogpt_platform/frontend/src/components/ui/carousel.tsx
+++ b/autogpt_platform/frontend/src/components/ui/carousel.tsx
@@ -213,7 +213,7 @@ const CarouselPrevious = React.forwardRef<
         className={cn(
           "absolute h-[52px] w-[52px] rounded-full",
           orientation === "horizontal"
-            ? "-bottom-20 right-24 -translate-y-1/2"
+            ? "right-24 top-0"
             : "-top-12 left-1/2 -translate-x-1/2 rotate-90",
           className,
         )}
@@ -259,7 +259,7 @@ const CarouselNext = React.forwardRef<
         className={cn(
           "absolute h-[52px] w-[52px] rounded-full",
           orientation === "horizontal"
-            ? "-bottom-20 right-4 -translate-y-1/2"
+            ? "right-4 top-0"
             : "-bottom-12 left-1/2 -translate-x-1/2 rotate-90",
           className,
         )}
@@ -302,7 +302,7 @@ const CarouselIndicator = React.forwardRef<
   return (
     <div
       ref={ref}
-      className={cn("relative top-10 flex h-3 items-center gap-2", className)}
+      className={cn("relative top-7 flex h-3 items-center gap-2", className)}
       {...props}
     >
       {scrollSnaps.map((_, index) => (