diff --git a/components/common/GearSelector.tsx b/components/common/GearSelector.tsx
index 22bf0973f..d6b140566 100644
--- a/components/common/GearSelector.tsx
+++ b/components/common/GearSelector.tsx
@@ -19,7 +19,7 @@ const GearSelector: React.FC<WeaponSelectorProps> = ({
   const { i18n } = useLingui();
   const singleOption = (props: any) => (
     <components.Option {...props}>
-      <Flex alignItems="center" color={props.isFocused ? "black" : undefined}>
+      <Flex alignItems="center">
         <Box mr="0.5em">
           <GearImage mini englishName={props.value} />
         </Box>
diff --git a/components/common/UserAvatar.tsx b/components/common/UserAvatar.tsx
index c282612af..217091eb3 100644
--- a/components/common/UserAvatar.tsx
+++ b/components/common/UserAvatar.tsx
@@ -11,18 +11,15 @@ const UserAvatar: React.FC<Props & AvatarProps> = ({
   user,
   isSmall,
   ...props
-}) => {
-  console.log({ user });
-  return (
-    <Avatar
-      name={user.username}
-      src={`https://cdn.discordapp.com/avatars/${user.discordId}/${
-        user.discordAvatar
-      }.jpg${isSmall ? "?size=40" : ""}`}
-      size={isSmall ? "sm" : undefined}
-      {...props}
-    />
-  );
-};
+}) => (
+  <Avatar
+    name={user.username}
+    src={`https://cdn.discordapp.com/avatars/${user.discordId}/${
+      user.discordAvatar
+    }.jpg${isSmall ? "?size=40" : ""}`}
+    size={isSmall ? "sm" : undefined}
+    {...props}
+  />
+);
 
 export default UserAvatar;
diff --git a/components/common/UserSelector.tsx b/components/common/UserSelector.tsx
index acee13533..bed975fb6 100644
--- a/components/common/UserSelector.tsx
+++ b/components/common/UserSelector.tsx
@@ -75,7 +75,6 @@ const UserSelector: React.FC<SingleSelectorProps | MultiSelectorProps> = ({
   );
 
   function getUsersArray() {
-    console.log({ value, maxMultiCount });
     if (!data) return [];
     if (isTooManyItems()) {
       return [];
diff --git a/components/common/WeaponSelector.tsx b/components/common/WeaponSelector.tsx
index 54ef4d0f2..dd4bc16dc 100644
--- a/components/common/WeaponSelector.tsx
+++ b/components/common/WeaponSelector.tsx
@@ -20,8 +20,7 @@ interface SelectorProps {
 interface SingleSelectorProps extends SelectorProps {
   value?: string;
   setValue: (value: string) => void;
-  isMulti: false | undefined;
-  maxMultiCount: undefined;
+  isMulti: false;
 }
 
 interface MultiSelectorProps extends SelectorProps {
@@ -31,17 +30,9 @@ interface MultiSelectorProps extends SelectorProps {
   maxMultiCount: number;
 }
 
-const WeaponSelector: React.FC<SingleSelectorProps | MultiSelectorProps> = ({
-  value,
-  setValue,
-  isClearable = false,
-  autoFocus,
-  isMulti,
-  maxMultiCount,
-  menuIsOpen,
-  isDisabled,
-  pool,
-}) => {
+const WeaponSelector: React.FC<SingleSelectorProps | MultiSelectorProps> = (
+  props
+) => {
   const { i18n } = useLingui();
   const singleOption = (props: any) => (
     <components.Option {...props}>
@@ -54,6 +45,8 @@ const WeaponSelector: React.FC<SingleSelectorProps | MultiSelectorProps> = ({
     </components.Option>
   );
 
+  const maxMultiCount = props.isMulti ? props.maxMultiCount : Infinity;
+
   return (
     <MySelect
       options={getWeaponArray().map((category) => ({
@@ -64,36 +57,36 @@ const WeaponSelector: React.FC<SingleSelectorProps | MultiSelectorProps> = ({
         })),
       }))}
       value={getValue()}
-      setValue={setValue}
-      isClearable={isClearable}
+      setValue={props.setValue}
+      isClearable={!!props.isClearable}
       isSearchable
-      isMulti={isMulti}
-      menuIsOpen={menuIsOpen}
+      isMulti={props.isMulti}
+      menuIsOpen={!!props.menuIsOpen}
       components={{
         IndicatorSeparator: () => null,
         Option: singleOption,
         NoOptionsMessage: () => (
           <Center p={4}>
             {isTooManyItems() ? (
-              <Trans>Only {maxMultiCount} weapons allowed</Trans>
+              <Trans>Only {props} weapons allowed</Trans>
             ) : (
               <Trans>No results with this filter</Trans>
             )}
           </Center>
         ),
       }}
-      autoFocus={autoFocus}
-      isDisabled={isDisabled}
+      autoFocus={!!props.autoFocus}
+      isDisabled={!!props.isDisabled}
     />
   );
 
   function getValue() {
-    if (typeof value === "string") {
-      return { value, label: i18n._(value) };
+    if (typeof props.value === "string") {
+      return { value: props.value, label: i18n._(props.value) };
     }
 
-    if (Array.isArray(value)) {
-      return value.map((singleValue) => ({
+    if (Array.isArray(props.value)) {
+      return props.value.map((singleValue) => ({
         value: singleValue,
         label: i18n._(singleValue),
       }));
@@ -104,8 +97,8 @@ const WeaponSelector: React.FC<SingleSelectorProps | MultiSelectorProps> = ({
 
   function getWeaponArray() {
     if (isTooManyItems()) return [];
-    if (pool === "WITH_ALTS") return weaponsWithHeroCategorized;
-    if (pool === "SALMON_RUN")
+    if (props.pool === "WITH_ALTS") return weaponsWithHeroCategorized;
+    if (props.pool === "SALMON_RUN")
       return weaponsWithHeroCategorized.map((category) => ({
         ...category,
         weapons: category.weapons.filter((wpn) => salmonRunWeapons.has(wpn)),
@@ -120,7 +113,7 @@ const WeaponSelector: React.FC<SingleSelectorProps | MultiSelectorProps> = ({
   }
 
   function isTooManyItems() {
-    return maxMultiCount && maxMultiCount <= (value ?? []).length;
+    return maxMultiCount && maxMultiCount <= (props.value ?? []).length;
   }
 };
 
diff --git a/components/u/BuildModal.tsx b/components/u/BuildModal.tsx
index 2b8f6b76f..addaf623c 100644
--- a/components/u/BuildModal.tsx
+++ b/components/u/BuildModal.tsx
@@ -178,6 +178,7 @@ const BuildModal: React.FC<Props> = ({ onClose, build }) => {
                       value={value}
                       setValue={onChange}
                       pool="WITH_ALTS"
+                      isMulti={false}
                     />
                   )}
                 />
diff --git a/pages/analyzer.tsx b/pages/analyzer.tsx
index c41643342..d99231955 100644
--- a/pages/analyzer.tsx
+++ b/pages/analyzer.tsx
@@ -84,7 +84,7 @@ const BuildAnalyzerPage = () => {
       </Flex>
 
       <Box my="1em">
-        <WeaponSelector value={weapon} setValue={setWeapon} />
+        <WeaponSelector value={weapon} setValue={setWeapon} isMulti={false} />
       </Box>
       <Wrap justify="space-between">
         <Box>
diff --git a/pages/builds/[[...slug]].tsx b/pages/builds/[[...slug]].tsx
index f1c84e89c..657a3decc 100644
--- a/pages/builds/[[...slug]].tsx
+++ b/pages/builds/[[...slug]].tsx
@@ -28,53 +28,52 @@ const BuildsPage = () => {
           setValue={(weapon) => dispatch({ type: "SET_WEAPON", weapon })}
           menuIsOpen={!state.weapon}
           autoFocus
+          isMulti={false}
         />
       </Box>
-      <>
-        {state.weapon && (
-          <>
-            <Box mt={4} pr={3} mb="-5rem">
-              <WeaponImage name={state.weapon} size={128} />
-            </Box>
+      {state.weapon && (
+        <>
+          <Box mt={4} pr={3} mb="-5rem">
+            <WeaponImage name={state.weapon} size={128} />
+          </Box>
+          <Flex
+            justifyContent="flex-end"
+            p={2}
+            mb={8}
+            w="100%"
+            bg={secondaryBgColor}
+            rounded="lg"
+            fontSize="sm"
+            boxShadow="md"
+          >
             <Flex
-              justifyContent="flex-end"
-              p={2}
-              mb={8}
-              w="100%"
-              bg={secondaryBgColor}
-              rounded="lg"
-              fontSize="sm"
-              boxShadow="md"
+              justifyContent="space-between"
+              fontSize="xs"
+              textColor="black"
+              textTransform="uppercase"
+              letterSpacing="wider"
+              lineHeight="1rem"
+              fontWeight="medium"
             >
-              <Flex
-                justifyContent="space-between"
-                fontSize="xs"
-                textColor="black"
-                textTransform="uppercase"
-                letterSpacing="wider"
-                lineHeight="1rem"
-                fontWeight="medium"
+              <Box
+                visibility={
+                  data.length === 0 && hiddenBuildCount === 0
+                    ? "hidden"
+                    : undefined
+                }
+                color={themeColorShade}
               >
-                <Box
-                  visibility={
-                    data.length === 0 && hiddenBuildCount === 0
-                      ? "hidden"
-                      : undefined
-                  }
-                  color={themeColorShade}
-                >
-                  {data.length} <Trans>builds</Trans>{" "}
-                  {hiddenBuildCount > 0 && (
-                    <>
-                      (+ {hiddenBuildCount} <Trans>hidden</Trans>)
-                    </>
-                  )}
-                </Box>
-              </Flex>
+                {data.length} <Trans>builds</Trans>{" "}
+                {hiddenBuildCount > 0 && (
+                  <>
+                    (+ {hiddenBuildCount} <Trans>hidden</Trans>)
+                  </>
+                )}
+              </Box>
             </Flex>
-          </>
-        )}
-      </>
+          </Flex>
+        </>
+      )}
 
       {state.weapon && (
         <BuildFilters filters={state.filters} dispatch={dispatch} />