diff --git a/src/admin/components/elements/Banner/index.tsx b/src/admin/components/elements/Banner/index.tsx
index 3bea04b684..6e16058e4d 100644
--- a/src/admin/components/elements/Banner/index.tsx
+++ b/src/admin/components/elements/Banner/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Props } from './types';
+import { Props, RenderedTypeProps } from './types';
 
 import './index.scss';
 
@@ -25,7 +25,7 @@ const Banner: React.FC<Props> = ({
     icon && `${baseClass}--align-icon-${alignIcon}`,
   ].filter(Boolean).join(' ');
 
-  let RenderedType = 'div';
+  let RenderedType: string | React.ComponentType<RenderedTypeProps> = 'div';
 
   if (onClick && !to) RenderedType = 'button';
   if (to) RenderedType = Link;
@@ -34,7 +34,6 @@ const Banner: React.FC<Props> = ({
     <RenderedType
       className={classes}
       onClick={onClick}
-      type={RenderedType === 'button' ? 'button' : undefined}
       to={to || undefined}
     >
       {(icon && alignIcon === 'left') && (
diff --git a/src/admin/components/elements/Banner/types.ts b/src/admin/components/elements/Banner/types.ts
index a7e366b31e..9cd1d45e7e 100644
--- a/src/admin/components/elements/Banner/types.ts
+++ b/src/admin/components/elements/Banner/types.ts
@@ -1,11 +1,19 @@
 import { MouseEvent } from 'react';
 
+type onClick = (event: MouseEvent) => void
+
 export type Props = {
   children?: React.ReactNode,
   className?: string,
   icon?: React.ReactNode,
   alignIcon?: 'left' | 'right',
-  onClick?: (event: MouseEvent) => void,
+  onClick?: onClick
   to?: string,
   type?: 'error' | 'success' | 'info' | 'default',
 }
+
+export type RenderedTypeProps = {
+  className?: string
+  onClick?: onClick
+  to: string
+}
diff --git a/src/admin/components/elements/ColumnSelector/getInitialState.tsx b/src/admin/components/elements/ColumnSelector/getInitialState.tsx
deleted file mode 100644
index 041985d494..0000000000
--- a/src/admin/components/elements/ColumnSelector/getInitialState.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-const getInitialColumnState = (fields, useAsTitle, defaultColumns) => {
-  let initialColumns = [];
-
-  if (Array.isArray(defaultColumns) && defaultColumns.length >= 1) {
-    return {
-      columns: defaultColumns,
-    };
-  }
-
-
-  if (useAsTitle) {
-    initialColumns.push(useAsTitle);
-  }
-
-  const remainingColumns = fields.reduce((remaining, field) => {
-    if (field.name === useAsTitle) {
-      return remaining;
-    }
-
-    if (!field.name && Array.isArray(field.fields)) {
-      return [
-        ...remaining,
-        ...field.fields.map((subField) => subField.name),
-      ];
-    }
-
-    return [
-      ...remaining,
-      field.name,
-    ];
-  }, []);
-
-  initialColumns = initialColumns.concat(remainingColumns);
-  initialColumns = initialColumns.slice(0, 4);
-
-  return {
-    columns: initialColumns,
-  };
-};
-
-
-module.exports = getInitialColumnState;
diff --git a/src/admin/components/elements/ColumnSelector/types.ts b/src/admin/components/elements/ColumnSelector/types.ts
index e44d71d2dd..a27578745b 100644
--- a/src/admin/components/elements/ColumnSelector/types.ts
+++ b/src/admin/components/elements/ColumnSelector/types.ts
@@ -1,6 +1,6 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
-  collection: Collection,
+  collection: CollectionConfig,
   handleChange: (columns) => void,
 }
diff --git a/src/admin/components/elements/DatePicker/index.tsx b/src/admin/components/elements/DatePicker/index.tsx
index e1297bc820..1143563725 100644
--- a/src/admin/components/elements/DatePicker/index.tsx
+++ b/src/admin/components/elements/DatePicker/index.tsx
@@ -3,7 +3,7 @@ import Loading from '../Loading';
 
 const DatePicker = lazy(() => import('./DatePicker'));
 
-export default (props) => (
+export default (props: unknown): React.ReactNode => (
   <Suspense fallback={<Loading />}>
     <DatePicker {...props} />
   </Suspense>
diff --git a/src/admin/components/elements/DeleteDocument/index.tsx b/src/admin/components/elements/DeleteDocument/index.tsx
index 8eef3fb4ec..6b96dd5105 100644
--- a/src/admin/components/elements/DeleteDocument/index.tsx
+++ b/src/admin/components/elements/DeleteDocument/index.tsx
@@ -83,7 +83,6 @@ const DeleteDocument: React.FC<Props> = (props) => {
       <React.Fragment>
         <button
           type="button"
-          slug={modalSlug}
           className={`${baseClass}__toggle`}
           onClick={(e) => {
             e.preventDefault();
diff --git a/src/admin/components/elements/DeleteDocument/types.ts b/src/admin/components/elements/DeleteDocument/types.ts
index 80d10a6b5d..c547e160e8 100644
--- a/src/admin/components/elements/DeleteDocument/types.ts
+++ b/src/admin/components/elements/DeleteDocument/types.ts
@@ -1,7 +1,7 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
-  collection?: Collection,
+  collection?: CollectionConfig,
   id?: string,
   title?: string,
 }
diff --git a/src/admin/components/elements/GenerateConfirmation/index.tsx b/src/admin/components/elements/GenerateConfirmation/index.tsx
index f3d9563207..3a5d279301 100644
--- a/src/admin/components/elements/GenerateConfirmation/index.tsx
+++ b/src/admin/components/elements/GenerateConfirmation/index.tsx
@@ -31,7 +31,6 @@ const GenerateConfirmation: React.FC<Props> = (props) => {
       <Button
         size="small"
         buttonStyle="secondary"
-        slug={modalSlug}
         onClick={() => {
           toggle(modalSlug);
         }}
diff --git a/src/admin/components/elements/GenerateConfirmation/types.ts b/src/admin/components/elements/GenerateConfirmation/types.ts
index c22f197100..43e955fb99 100644
--- a/src/admin/components/elements/GenerateConfirmation/types.ts
+++ b/src/admin/components/elements/GenerateConfirmation/types.ts
@@ -1,5 +1,3 @@
-import { createTrue } from 'typescript';
-
 export type Props = {
   setKey: () => void,
   highlightField: (Boolean) => void,
diff --git a/src/admin/components/elements/ListControls/index.tsx b/src/admin/components/elements/ListControls/index.tsx
index 47807b3180..d79af44911 100644
--- a/src/admin/components/elements/ListControls/index.tsx
+++ b/src/admin/components/elements/ListControls/index.tsx
@@ -22,7 +22,6 @@ const ListControls: React.FC<Props> = (props) => {
       fields,
       admin: {
         useAsTitle,
-        defaultColumns,
       },
     },
   } = props;
@@ -31,7 +30,7 @@ const ListControls: React.FC<Props> = (props) => {
   const [search, setSearch] = useState('');
   const [columns, setColumns] = useState([]);
   const [where, setWhere] = useState({});
-  const [visibleDrawer, setVisibleDrawer] = useState(false);
+  const [visibleDrawer, setVisibleDrawer] = useState<'where' | 'sort' | 'columns'>();
 
   useEffect(() => {
     if (useAsTitle) {
@@ -44,7 +43,7 @@ const ListControls: React.FC<Props> = (props) => {
   }, [useAsTitle, fields]);
 
   useEffect(() => {
-    const newState = {
+    const newState: any = {
       columns,
     };
 
@@ -83,7 +82,7 @@ const ListControls: React.FC<Props> = (props) => {
               <Button
                 className={`${baseClass}__toggle-columns`}
                 buttonStyle={visibleDrawer === 'columns' ? undefined : 'secondary'}
-                onClick={() => setVisibleDrawer(visibleDrawer !== 'columns' ? 'columns' : false)}
+                onClick={() => setVisibleDrawer(visibleDrawer !== 'columns' ? 'columns' : undefined)}
                 icon="chevron"
                 iconStyle="none"
               >
@@ -93,7 +92,7 @@ const ListControls: React.FC<Props> = (props) => {
             <Button
               className={`${baseClass}__toggle-where`}
               buttonStyle={visibleDrawer === 'where' ? undefined : 'secondary'}
-              onClick={() => setVisibleDrawer(visibleDrawer !== 'where' ? 'where' : false)}
+              onClick={() => setVisibleDrawer(visibleDrawer !== 'where' ? 'where' : undefined)}
               icon="chevron"
               iconStyle="none"
             >
@@ -103,7 +102,7 @@ const ListControls: React.FC<Props> = (props) => {
               <Button
                 className={`${baseClass}__toggle-sort`}
                 buttonStyle={visibleDrawer === 'sort' ? undefined : 'secondary'}
-                onClick={() => setVisibleDrawer(visibleDrawer !== 'sort' ? 'sort' : false)}
+                onClick={() => setVisibleDrawer(visibleDrawer !== 'sort' ? 'sort' : undefined)}
                 icon="chevron"
                 iconStyle="none"
               >
@@ -120,7 +119,6 @@ const ListControls: React.FC<Props> = (props) => {
         >
           <ColumnSelector
             collection={collection}
-            defaultColumns={defaultColumns}
             handleChange={setColumns}
           />
         </AnimateHeight>
diff --git a/src/admin/components/elements/ListControls/types.ts b/src/admin/components/elements/ListControls/types.ts
index f63be97f9c..3ca68b855d 100644
--- a/src/admin/components/elements/ListControls/types.ts
+++ b/src/admin/components/elements/ListControls/types.ts
@@ -1,9 +1,9 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
   enableColumns?: boolean,
   enableSort?: boolean,
   setSort: () => void,
-  collection: Collection,
+  collection: CollectionConfig,
   handleChange: (newState) => void,
 }
diff --git a/src/admin/components/elements/Localizer/index.tsx b/src/admin/components/elements/Localizer/index.tsx
index 37079e3d52..557a89fce3 100644
--- a/src/admin/components/elements/Localizer/index.tsx
+++ b/src/admin/components/elements/Localizer/index.tsx
@@ -47,7 +47,7 @@ const Localizer: React.FC<Props> = () => {
                     return (
                       <li
                         key={localeOption}
-                        className={localeClasses}
+                        className={localeClasses.join(' ')}
                       >
                         <Link
                           to={{ search }}
diff --git a/src/admin/components/elements/Nav/index.tsx b/src/admin/components/elements/Nav/index.tsx
index 1307d5e8de..8f84df226a 100644
--- a/src/admin/components/elements/Nav/index.tsx
+++ b/src/admin/components/elements/Nav/index.tsx
@@ -127,7 +127,7 @@ const DefaultNav = () => {
   );
 };
 
-const Nav = () => {
+const Nav: React.FC = () => {
   const {
     admin: {
       components: {
diff --git a/src/admin/components/elements/Paginator/index.tsx b/src/admin/components/elements/Paginator/index.tsx
index 2360ad89ac..f7f55098fa 100644
--- a/src/admin/components/elements/Paginator/index.tsx
+++ b/src/admin/components/elements/Paginator/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import queryString from 'qs';
-import { Props } from './types';
+import { Props, Node } from './types';
 
 import Page from './Page';
 import Separator from './Separator';
@@ -58,7 +58,7 @@ const Pagination: React.FC<Props> = (props) => {
   const rangeEndIndex = (currentPage - 1) + numberOfNeighbors + 1;
 
   // Slice out the range of pages that we want to render
-  const nodes = pages.slice(rangeStartIndex, rangeEndIndex);
+  const nodes: Node[] = pages.slice(rangeStartIndex, rangeEndIndex);
 
   // Add prev separator if necessary
   if (currentPage - numberOfNeighbors - 1 >= 2) nodes.unshift({ type: 'Separator' });
diff --git a/src/admin/components/elements/Paginator/types.ts b/src/admin/components/elements/Paginator/types.ts
index 0a1a192f93..ea55fd2a64 100644
--- a/src/admin/components/elements/Paginator/types.ts
+++ b/src/admin/components/elements/Paginator/types.ts
@@ -10,3 +10,15 @@ export type Props = {
   disableHistoryChange?: boolean,
   onChange?: (page) => void,
 }
+
+export type Node = {
+  type: 'Page' | 'Separator' | 'ClickableArrow'
+  props?: {
+    page?: number
+    updatePage: (page: number) => void
+    isFirstPage?: boolean
+    isLastPage?: boolean
+    isDisabled?: boolean
+    direction?: 'right' | 'left'
+  }
+} | number
diff --git a/src/admin/components/elements/SortComplex/types.ts b/src/admin/components/elements/SortComplex/types.ts
index 62da384c23..b29c93f435 100644
--- a/src/admin/components/elements/SortComplex/types.ts
+++ b/src/admin/components/elements/SortComplex/types.ts
@@ -1,6 +1,6 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
-  handleChange: (any) => void,
-  collection: Collection,
+  handleChange: (controls: any) => void,
+  collection: CollectionConfig,
 }
diff --git a/src/admin/components/elements/WhereBuilder/types.ts b/src/admin/components/elements/WhereBuilder/types.ts
index f7e1e15d0f..b29c93f435 100644
--- a/src/admin/components/elements/WhereBuilder/types.ts
+++ b/src/admin/components/elements/WhereBuilder/types.ts
@@ -1,6 +1,6 @@
-import { Collection } from '../../../../collections/config/types';
+import { CollectionConfig } from '../../../../collections/config/types';
 
 export type Props = {
-  handleChange: () => void,
-  collection: Collection,
+  handleChange: (controls: any) => void,
+  collection: CollectionConfig,
 }
diff --git a/src/admin/components/forms/Form/buildStateFromSchema.ts b/src/admin/components/forms/Form/buildStateFromSchema.ts
index 983c543572..31e6e554df 100644
--- a/src/admin/components/forms/Form/buildStateFromSchema.ts
+++ b/src/admin/components/forms/Form/buildStateFromSchema.ts
@@ -4,11 +4,13 @@ import { Fields, Field, Data } from './types';
 const buildValidationPromise = async (fieldState: Field, field: FieldSchema) => {
   const validatedFieldState = fieldState;
 
-  validatedFieldState.valid = typeof field.validate === 'function' ? await field.validate(fieldState.value, field) : true;
+  const validationResult = typeof field.validate === 'function' ? await field.validate(fieldState.value, field) : true;
 
-  if (typeof validatedFieldState.valid === 'string') {
-    validatedFieldState.errorMessage = validatedFieldState.valid;
+  if (typeof validationResult === 'string') {
+    validatedFieldState.errorMessage = validationResult;
     validatedFieldState.valid = false;
+  } else {
+    validatedFieldState.valid = true;
   }
 };
 
@@ -86,7 +88,7 @@ const buildStateFromSchema = async (fieldSchema: FieldSchema[], fullData: Data =
         }
 
         // Handle non-array-based nested fields (group, etc)
-        if (field.type === 'row' || field.type === 'group') {
+        if (field.type === 'group') {
           const subFieldData = initialData?.[field.name] as Data;
 
           return {
@@ -102,7 +104,7 @@ const buildStateFromSchema = async (fieldSchema: FieldSchema[], fullData: Data =
       }
 
       // Handle field types that do not use names (row, etc)
-      if (field.type === 'row' || field.type === 'group') {
+      if (field.type === 'row') {
         return {
           ...state,
           ...iterateFields(field.fields, data, path),