diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index ad27beba..7e8d4bed 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -2,7 +2,6 @@
 name: UI Testing
 on:
   deployment_status:
-  push:
 defaults:
   run:
     working-directory: ./playwright
diff --git a/backend/src/api/app.ts b/backend/src/api/app.ts
index 093f0f46..c697d24d 100644
--- a/backend/src/api/app.ts
+++ b/backend/src/api/app.ts
@@ -13,6 +13,7 @@ import * as search from './search';
 import * as vulnerabilities from './vulnerabilities';
 import * as organizations from './organizations';
 import * as scans from './scans';
+import * as logs from './logs';
 import * as users from './users';
 import * as scanTasks from './scan-tasks';
 import * as stats from './stats';
@@ -22,12 +23,13 @@ import * as reports from './reports';
 import * as savedSearches from './saved-searches';
 import rateLimit from 'express-rate-limit';
 import { createProxyMiddleware } from 'http-proxy-middleware';
-import { User, UserType, connectToDatabase } from '../models';
+import { Organization, User, UserType, connectToDatabase } from '../models';
 import * as assessments from './assessments';
 import * as jwt from 'jsonwebtoken';
 import { Request, Response, NextFunction } from 'express';
 import fetch from 'node-fetch';
 import * as searchOrganizations from './organizationSearch';
+import { Logger, RecordMessage } from '../tools/logger';
 
 const sanitizer = require('sanitizer');
 
@@ -43,27 +45,41 @@ if (
   setInterval(() => scheduler({}, {} as any, () => null), 30000);
 }
 
-const handlerToExpress = (handler) => async (req, res) => {
-  const { statusCode, body } = await handler(
-    {
-      pathParameters: req.params,
-      query: req.query,
-      requestContext: req.requestContext,
-      body: JSON.stringify(req.body || '{}'),
-      headers: req.headers,
-      path: req.originalUrl
-    },
-    {}
-  );
-  try {
-    const parsedBody = JSON.parse(sanitizer.sanitize(body));
-    res.status(statusCode).json(parsedBody);
-  } catch (e) {
-    // Not a JSON body
-    res.setHeader('content-type', 'text/plain');
-    res.status(statusCode).send(sanitizer.sanitize(body));
-  }
-};
+const handlerToExpress =
+  (handler, message?: RecordMessage, action?: string) => async (req, res) => {
+    const logger = new Logger(req);
+    const { statusCode, body } = await handler(
+      {
+        pathParameters: req.params,
+        query: req.query,
+        requestContext: req.requestContext,
+        body: JSON.stringify(req.body || '{}'),
+        headers: req.headers,
+        path: req.originalUrl
+      },
+      {}
+    );
+    // Add additional status codes that we may return for succesfull requests
+    if (statusCode === 200) {
+      if (message && action) {
+        logger.record(action, 'success', message, body);
+      }
+    } else {
+      if (message && action) {
+        logger.record(action, 'fail', message, body);
+      }
+    }
+
+    try {
+      const parsedBody = JSON.parse(sanitizer.sanitize(body));
+      res.status(200).json(parsedBody);
+    } catch (e) {
+      // Not valid JSON - may be a string response.
+      console.log('Error?', e);
+      res.setHeader('content-type', 'text/plain');
+      res.status(statusCode).send(sanitizer.sanitize(body));
+    }
+  };
 
 const app = express();
 
@@ -234,10 +250,7 @@ app.post('/auth/okta-callback', async (req, res) => {
             oktaId: oktaId,
             firstName: decodedToken.given_name,
             lastName: decodedToken.family_name,
-            invitePending: true,
-            // TODO: Replace these default Region/State values with user selection
-            state: 'Virginia',
-            regionId: '3'
+            invitePending: true
           });
           await user.save();
         } else {
@@ -577,6 +590,7 @@ authenticatedRoute.delete(
   handlerToExpress(savedSearches.del)
 );
 authenticatedRoute.get('/scans', handlerToExpress(scans.list));
+authenticatedRoute.post('/logs/search', handlerToExpress(logs.list));
 authenticatedRoute.get('/granularScans', handlerToExpress(scans.listGranular));
 authenticatedRoute.post('/scans', handlerToExpress(scans.create));
 authenticatedRoute.get('/scans/:scanId', handlerToExpress(scans.get));
@@ -634,12 +648,39 @@ authenticatedRoute.delete(
 );
 authenticatedRoute.post(
   '/v2/organizations/:organizationId/users',
-  handlerToExpress(organizations.addUserV2)
+  handlerToExpress(
+    organizations.addUserV2,
+    async (req, user) => {
+      const orgId = req?.params?.organizationId;
+      const userId = req?.body?.userId;
+      const role = req?.body?.role;
+      if (orgId && userId) {
+        const orgRecord = await Organization.findOne({ where: { id: orgId } });
+        const userRecord = await User.findOne({ where: { id: userId } });
+        return {
+          timestamp: new Date(),
+          userPerformedAssignment: user?.data?.id,
+          organization: orgRecord,
+          role: role,
+          user: userRecord
+        };
+      }
+      return {
+        timestamp: new Date(),
+        userId: user?.data?.id,
+        updatePayload: req.body
+      };
+    },
+    'USER ASSIGNED'
+  )
 );
+
 authenticatedRoute.post(
   '/organizations/:organizationId/roles/:roleId/approve',
   handlerToExpress(organizations.approveRole)
 );
+
+// TO-DO Add logging => /users => user has an org and you change them to a new organization
 authenticatedRoute.post(
   '/organizations/:organizationId/roles/:roleId/remove',
   handlerToExpress(organizations.removeRole)
@@ -657,9 +698,58 @@ authenticatedRoute.post(
   handlerToExpress(organizations.checkDomainVerification)
 );
 authenticatedRoute.post('/stats', handlerToExpress(stats.get));
-authenticatedRoute.post('/users', handlerToExpress(users.invite));
+authenticatedRoute.post(
+  '/users',
+  handlerToExpress(
+    users.invite,
+    async (req, user, responseBody) => {
+      const userId = user?.data?.id;
+      if (userId) {
+        const userRecord = await User.findOne({ where: { id: userId } });
+        return {
+          timestamp: new Date(),
+          userPerformedInvite: userRecord,
+          invitePayload: req.body,
+          createdUserRecord: responseBody
+        };
+      }
+      return {
+        timestamp: new Date(),
+        userId: user.data?.id,
+        invitePayload: req.body,
+        createdUserRecord: responseBody
+      };
+    },
+    'USER INVITE'
+  )
+);
 authenticatedRoute.get('/users', handlerToExpress(users.list));
-authenticatedRoute.delete('/users/:userId', handlerToExpress(users.del));
+authenticatedRoute.delete(
+  '/users/:userId',
+  handlerToExpress(
+    users.del,
+    async (req, user, res) => {
+      const userId = req?.params?.userId;
+      const userPerformedRemovalId = user?.data?.id;
+      if (userId && userPerformedRemovalId) {
+        const userPerformdRemovalRecord = await User.findOne({
+          where: { id: userPerformedRemovalId }
+        });
+        return {
+          timestamp: new Date(),
+          userPerformedRemoval: userPerformdRemovalRecord,
+          userRemoved: userId
+        };
+      }
+      return {
+        timestamp: new Date(),
+        userPerformedRemoval: user.data?.id,
+        userRemoved: req.params.userId
+      };
+    },
+    'USER DENY/REMOVE'
+  )
+);
 authenticatedRoute.get(
   '/users/state/:state',
   handlerToExpress(users.getByState)
@@ -684,7 +774,17 @@ authenticatedRoute.post(
 authenticatedRoute.put(
   '/users/:userId/register/approve',
   checkGlobalAdminOrRegionAdmin,
-  handlerToExpress(users.registrationApproval)
+  handlerToExpress(
+    users.registrationApproval,
+    async (req, user) => {
+      return {
+        timestamp: new Date(),
+        userId: user?.data?.id,
+        userToApprove: req.params.userId
+      };
+    },
+    'USER APPROVE'
+  )
 );
 
 authenticatedRoute.put(
diff --git a/backend/src/api/domains.ts b/backend/src/api/domains.ts
index 651e5233..dd8924e5 100644
--- a/backend/src/api/domains.ts
+++ b/backend/src/api/domains.ts
@@ -169,7 +169,6 @@ class DomainSearch {
  *    - Domains
  */
 export const list = wrapHandler(async (event) => {
-  console.log('Hello, list handler');
   if (!isGlobalViewAdmin(event) && getOrgMemberships(event).length === 0) {
     console.log('returning no results');
     return {
diff --git a/backend/src/api/logs.ts b/backend/src/api/logs.ts
new file mode 100644
index 00000000..75087058
--- /dev/null
+++ b/backend/src/api/logs.ts
@@ -0,0 +1,175 @@
+import { SelectQueryBuilder } from 'typeorm';
+import { Log } from '../models';
+import { validateBody, wrapHandler } from './helpers';
+import { IsDate, IsOptional, IsString } from 'class-validator';
+
+type ParsedQuery = {
+  [key: string]: string | ParsedQuery;
+};
+
+const parseQueryString = (query: string): ParsedQuery => {
+  // Parses a query string that is used to search the JSON payload of a record
+  // Example => createdUserPayload.userId: 123124121424
+  const result: ParsedQuery = {};
+
+  const parts = query.match(/(\w+(\.\w+)*):\s*[^:]+/g);
+
+  if (!parts) {
+    return result;
+  }
+
+  parts.forEach((part) => {
+    const [key, value] = part.split(/:(.+)/);
+
+    if (!key || value === undefined) return;
+
+    const keyParts = key.trim().split('.');
+    let current = result;
+
+    keyParts.forEach((part, index) => {
+      if (index === keyParts.length - 1) {
+        current[part] = value.trim();
+      } else {
+        if (!current[part]) {
+          current[part] = {};
+        }
+        current = current[part] as ParsedQuery;
+      }
+    });
+  });
+
+  return result;
+};
+
+const generateSqlConditions = (
+  parsedQuery: ParsedQuery,
+  jsonPath: string[] = []
+): string[] => {
+  const conditions: string[] = [];
+
+  for (const [key, value] of Object.entries(parsedQuery)) {
+    if (typeof value === 'object') {
+      const newPath = [...jsonPath, key];
+      conditions.push(...generateSqlConditions(value, newPath));
+    } else {
+      const jsonField =
+        jsonPath.length > 0
+          ? `${jsonPath.map((path) => `'${path}'`).join('->')}->>'${key}'`
+          : `'${key}'`;
+      conditions.push(
+        `payload ${
+          jsonPath.length > 0 ? '->' : '->>'
+        } ${jsonField} = '${value}'`
+      );
+    }
+  }
+
+  return conditions;
+};
+class Filter {
+  @IsString()
+  value: string;
+
+  @IsString()
+  operator?: string;
+}
+
+class DateFilter {
+  @IsDate()
+  value: string;
+
+  @IsString()
+  operator:
+    | 'is'
+    | 'not'
+    | 'after'
+    | 'onOrAfter'
+    | 'before'
+    | 'onOrBefore'
+    | 'empty'
+    | 'notEmpty';
+}
+class LogSearch {
+  @IsOptional()
+  eventType?: Filter;
+  @IsOptional()
+  result?: Filter;
+  @IsOptional()
+  timestamp?: Filter;
+  @IsOptional()
+  payload?: Filter;
+}
+
+const generateDateCondition = (filter: DateFilter): string => {
+  const { operator } = filter;
+
+  switch (operator) {
+    case 'is':
+      return `log.createdAt = :timestamp`;
+    case 'not':
+      return `log.createdAt != :timestamp`;
+    case 'after':
+      return `log.createdAt > :timestamp`;
+    case 'onOrAfter':
+      return `log.createdAt >= :timestamp`;
+    case 'before':
+      return `log.createdAt < :timestamp`;
+    case 'onOrBefore':
+      return `log.createdAt <= :timestamp`;
+    case 'empty':
+      return `log.createdAt IS NULL`;
+    case 'notEmpty':
+      return `log.createdAt IS NOT NULL`;
+    default:
+      throw new Error('Invalid operator');
+  }
+};
+
+const filterResultQueryset = async (qs: SelectQueryBuilder<Log>, filters) => {
+  if (filters?.eventType) {
+    qs.andWhere('log.eventType ILIKE :eventType', {
+      eventType: `%${filters?.eventType?.value}%`
+    });
+  }
+  if (filters?.result) {
+    qs.andWhere('log.result ILIKE :result', {
+      result: `%${filters?.result?.value}%`
+    });
+  }
+  if (filters?.payload) {
+    try {
+      const parsedQuery = parseQueryString(filters?.payload?.value);
+      const conditions = generateSqlConditions(parsedQuery);
+      qs.andWhere(conditions[0]);
+    } catch (error) {}
+  }
+
+  if (filters?.timestamp) {
+    const timestampCondition = generateDateCondition(filters?.timestamp);
+    try {
+    } catch (error) {}
+    qs.andWhere(timestampCondition, {
+      timestamp: new Date(filters?.timestamp?.value)
+    });
+  }
+
+  return qs;
+};
+
+export const list = wrapHandler(async (event) => {
+  const search = await validateBody(LogSearch, event.body);
+
+  const qs = Log.createQueryBuilder('log');
+
+  const filterQs = await filterResultQueryset(qs, search);
+
+  const [results, resultsCount] = await filterQs.getManyAndCount();
+
+  return {
+    statusCode: 200,
+    body: JSON.stringify({
+      result: results,
+      count: resultsCount
+    })
+  };
+});
diff --git a/backend/src/api/saved-searches.ts b/backend/src/api/saved-searches.ts
index 1497e429..fb0d30ba 100644
--- a/backend/src/api/saved-searches.ts
+++ b/backend/src/api/saved-searches.ts
@@ -61,13 +61,6 @@ class NewSavedSearch {
 
   @IsArray()
   filters: { field: string; values: any[]; type: string }[];
-
-  @IsBoolean()
-  createVulnerabilities: boolean;
-
-  @IsObject()
-  @IsOptional()
-  vulnerabilityTemplate: Partial<Vulnerability>;
 }
 
 const PAGE_SIZE = 20;
diff --git a/backend/src/models/connection.ts b/backend/src/models/connection.ts
index 8f2cfdbf..a32ba88d 100644
--- a/backend/src/models/connection.ts
+++ b/backend/src/models/connection.ts
@@ -21,6 +21,7 @@ import {
   User,
   Vulnerability,
   Webpage,
+  Log,
 
   //  Models for the Mini Data Lake database
   CertScan,
@@ -194,7 +195,8 @@ const connectDb = async (logging?: boolean) => {
       Service,
       User,
       Vulnerability,
-      Webpage
+      Webpage,
+      Log
     ],
     synchronize: false,
     name: 'default',
diff --git a/backend/src/models/index.ts b/backend/src/models/index.ts
index 85627560..d0b3814f 100644
--- a/backend/src/models/index.ts
+++ b/backend/src/models/index.ts
@@ -19,6 +19,7 @@ export * from './service';
 export * from './user';
 export * from './vulnerability';
 export * from './webpage';
+export * from './log';
 // Mini data lake models
 export * from './mini_data_lake/cert_scans';
 export * from './mini_data_lake/cidrs';
diff --git a/backend/src/models/log.ts b/backend/src/models/log.ts
new file mode 100644
index 00000000..2d128b18
--- /dev/null
+++ b/backend/src/models/log.ts
@@ -0,0 +1,19 @@
+import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity()
+export class Log extends BaseEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column('json')
+  payload: Object;
+
+  @Column({ nullable: false })
+  createdAt: Date;
+
+  @Column({ nullable: true })
+  eventType: string;
+
+  @Column({ nullable: false })
+  result: string;
+}
diff --git a/backend/src/models/saved-search.ts b/backend/src/models/saved-search.ts
index 91a9f63f..c8b42a07 100644
--- a/backend/src/models/saved-search.ts
+++ b/backend/src/models/saved-search.ts
@@ -42,17 +42,6 @@ export class SavedSearch extends BaseEntity {
   @Column()
   searchPath: string;
 
-  @Column({
-    default: false
-  })
-  createVulnerabilities: boolean;
-
-  // Content of vulnerability when search is configured to create vulnerabilities from results
-  @Column({ type: 'jsonb', default: '{}' })
-  vulnerabilityTemplate: Partial<Vulnerability> & {
-    title: string;
-  };
-
   @ManyToOne((type) => User, {
     onDelete: 'SET NULL',
     onUpdate: 'CASCADE'
diff --git a/backend/src/tasks/saved-search.ts b/backend/src/tasks/saved-search.ts
index cc63911b..8e8afca1 100644
--- a/backend/src/tasks/saved-search.ts
+++ b/backend/src/tasks/saved-search.ts
@@ -50,21 +50,6 @@ export const handler = async (commandOptions: CommandOptions) => {
     const hits: number = searchResults.body.hits.total.value;
     search.count = hits;
     search.save();
-
-    if (search.createVulnerabilities) {
-      const results = await fetchAllResults(filters, restrictions);
-      const vulnerabilities: Vulnerability[] = results.map((domain) =>
-        plainToClass(Vulnerability, {
-          domain: domain,
-          lastSeen: new Date(Date.now()),
-          ...search.vulnerabilityTemplate,
-          state: 'open',
-          source: 'saved-search',
-          needsPopulation: false
-        })
-      );
-      await saveVulnerabilitiesToDb(vulnerabilities, false);
-    }
   }
 
   console.log(`Saved search finished for ${savedSearches.length} searches`);
diff --git a/backend/src/tools/logger.ts b/backend/src/tools/logger.ts
new file mode 100644
index 00000000..df414c8e
--- /dev/null
+++ b/backend/src/tools/logger.ts
@@ -0,0 +1,120 @@
+import { Request } from 'express';
+import { decode } from 'jsonwebtoken';
+import { User } from '../models';
+import { attempt, unescape } from 'lodash';
+import { Log } from '../models/log';
+import { getRepository, Repository } from 'typeorm';
+
+type AccessTokenPayload = {
+  id: string;
+  email: string;
+  iat: string;
+  exp: string;
+};
+
+type LoggerUserState = {
+  data: User | undefined;
+  ready: boolean;
+  attempts: number;
+};
+
+type RecordPayload = object & {
+  timestamp: Date;
+};
+
+export type RecordMessage =
+  | ((
+      request: Request,
+      user: LoggerUserState,
+      responseBody?: object
+    ) => Promise<RecordPayload>)
+  | RecordPayload;
+
+export class Logger {
+  private request: Request;
+  private logId: string;
+  private token: AccessTokenPayload | undefined;
+  private user: LoggerUserState = {
+    data: undefined,
+    ready: false,
+    attempts: 0
+  };
+  private logRep: Repository<Log>;
+
+  async record(
+    action: string,
+    result: 'success' | 'fail',
+    messageOrCB: RecordMessage | undefined,
+    responseBody?: object | string
+  ) {
+    try {
+      if (!this.user.ready && this.user.attempts > 0) {
+        await this.fetchUser();
+      }
+
+      if (!this.logRep) {
+        const logRepository = getRepository(Log);
+        this.logRep = logRepository;
+      }
+
+      const parsedResponseBody =
+        typeof responseBody === 'string' &&
+        responseBody !== 'User registration approved.'
+          ? JSON.parse(responseBody)
+          : responseBody;
+
+      const payload =
+        typeof messageOrCB === 'function'
+          ? await messageOrCB(this.request, this.user, parsedResponseBody)
+          : messageOrCB;
+      const logRecord = await this.logRep.create({
+        payload: payload as object,
+        createdAt: payload?.timestamp,
+        result: result,
+        eventType: action
+      });
+
+      logRecord.save();
+    } catch (error) {
+      console.warn('Error occured in loggingMiddleware', error);
+    }
+  }
+
+  async fetchUser() {
+    if (this.token) {
+      const user = await User.findOne({ id: this.token.id });
+      if (user) {
+        this.user = {
+          data: user,
+          ready: true,
+          attempts: 0
+        };
+      }
+      this.user = {
+        data: undefined,
+        ready: false,
+        attempts: this.user.attempts + 1
+      };
+    }
+  }
+
+  // Constructor takes a request and sets it to a class variable
+  constructor(req: Request) {
+    this.request = req;
+    this.logId = '123123123123';
+    const authToken = req.headers.authorization;
+    if (authToken) {
+      const tokenPayload = decode(
+        authToken as string
+      ) as unknown as AccessTokenPayload;
+      this.token = tokenPayload;
+      User.findOne({ id: this.token.id }).then((user) => {
+        if (user) {
+          this.user = { data: user, ready: true, attempts: 0 };
+        }
+      });
+    }
+  }
+}
+
+// Database Tables
diff --git a/backend/test/__snapshots__/saved-searches.test.ts.snap b/backend/test/__snapshots__/saved-searches.test.ts.snap
index efd26fcd..94c479ac 100644
--- a/backend/test/__snapshots__/saved-searches.test.ts.snap
+++ b/backend/test/__snapshots__/saved-searches.test.ts.snap
@@ -3,7 +3,6 @@
 exports[`saved-search create create by user should succeed 1`] = `
 Object {
   "count": 3,
-  "createVulnerabilities": false,
   "createdAt": Any<String>,
   "createdBy": Object {
     "id": Any<String>,
@@ -16,6 +15,5 @@ Object {
   "sortDirection": "",
   "sortField": "",
   "updatedAt": Any<String>,
-  "vulnerabilityTemplate": Object {},
 }
 `;
diff --git a/backend/test/saved-searches.test.ts b/backend/test/saved-searches.test.ts
index 2158122a..fc87a624 100644
--- a/backend/test/saved-searches.test.ts
+++ b/backend/test/saved-searches.test.ts
@@ -45,9 +45,7 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
         })
         .expect(200);
       expect(response.body).toMatchSnapshot({
@@ -71,14 +69,11 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
         };
         const search = await SavedSearch.create(body).save();
         body.name = 'test-' + Math.random();
         body.searchTerm = '123';
-        body.createVulnerabilities = true;
         const response = await request(app)
           .put(`/saved-searches/${search.id}`)
           .set(
@@ -104,9 +99,7 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
         };
         const search = await SavedSearch.create({
           ...body,
@@ -114,7 +107,6 @@ describe('saved-search', () => {
         }).save();
         body.name = 'test-' + Math.random();
         body.searchTerm = '123';
-        body.createVulnerabilities = true;
         const response = await request(app)
           .put(`/saved-searches/${search.id}`)
           .set(
@@ -128,9 +120,6 @@ describe('saved-search', () => {
           .expect(200);
         expect(response.body.name).toEqual(body.name);
         expect(response.body.searchTerm).toEqual(body.searchTerm);
-        expect(response.body.createVulnerabilities).toEqual(
-          body.createVulnerabilities
-        );
       });
       it('update by standard user without access should fail', async () => {
         const user = await User.create({
@@ -153,8 +142,6 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
           createdBy: user
         };
         const search = await SavedSearch.create(body).save();
@@ -179,9 +166,7 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
         };
         const search = await SavedSearch.create(body).save();
         const response = await request(app)
@@ -206,9 +191,7 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
         }).save();
         const response = await request(app)
           .delete(`/saved-searches/${search.id}`)
@@ -235,8 +218,6 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         const response = await request(app)
@@ -272,8 +253,6 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         const response = await request(app)
@@ -309,8 +288,6 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         const response = await request(app)
@@ -335,9 +312,7 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
         }).save();
         const response = await request(app)
           .get(`/saved-searches`)
@@ -371,8 +346,6 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         // this org should not show up in the response
@@ -384,8 +357,6 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
           createdBy: user1
         }).save();
         const response = await request(app)
@@ -411,9 +382,7 @@ describe('saved-search', () => {
           sortField: '',
           searchTerm: '',
           searchPath: '',
-          filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {}
+          filters: []
         }).save();
         const response = await request(app)
           .get(`/saved-searches/${search.id}`)
@@ -440,8 +409,6 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
           createdBy: user
         }).save();
         const response = await request(app)
@@ -477,8 +444,6 @@ describe('saved-search', () => {
           searchTerm: '',
           searchPath: '',
           filters: [],
-          createVulnerabilities: false,
-          vulnerabilityTemplate: {},
           createdBy: user1
         }).save();
         const response = await request(app)
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 3b04f09f..483d6d58 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -3,7 +3,6 @@ import {
   BrowserRouter as Router,
   Switch,
   Route,
-  Redirect,
   useLocation
 } from 'react-router-dom';
 import { API, Auth } from 'aws-amplify';
@@ -42,6 +41,7 @@ import { RSCLogin } from 'components/ReadySetCyber/RSCLogin';
 import { RSCAuthLoginCreate } from 'components/ReadySetCyber/RSCAuthLoginCreate';
 import { RiskWithSearch } from 'pages/Risk/Risk';
 import { StaticsContextProvider } from 'context/StaticsContextProvider';
+import { SavedSearchContextProvider } from 'context/SavedSearchContextProvider';
 
 API.configure({
   endpoints: [
@@ -94,140 +94,173 @@ const App: React.FC = () => (
         <AuthContextProvider>
           <Authenticator.Provider>
             <StaticsContextProvider>
-              <SearchProvider>
-                <LayoutWithSearch>
-                  <LinkTracker />
-                  <Switch>
-                    <RouteGuard
-                      exact
-                      path="/"
-                      render={() => <Redirect to="/inventory" />}
-                      unauth={AuthLogin}
-                      component={RiskWithSearch}
-                    />
-                    <Route
-                      exact
-                      path="/login-gov-callback"
-                      component={LoginGovCallback}
-                    />
-                    <Route
-                      exact
-                      path="/okta-callback"
-                      component={OktaCallback}
-                    />
-                    <Route
-                      exact
-                      path="/create-account"
-                      component={AuthCreateAccount}
-                    />
-                    <Route exact path="/terms" component={TermsOfUse} />
-                    <RouteGuard
-                      exact
-                      path="/inventory"
-                      component={SearchPage}
-                      permissions={['globalView', 'regionalAdmin', 'standard']}
-                    />
-                    <RouteGuard
-                      path="/inventory/domain/:domainId"
-                      component={Domain}
-                      permissions={['globalView', 'regionalAdmin', 'standard']}
-                    />
-                    <RouteGuard path="/inventory/domains" component={Domains} />
-                    <RouteGuard
-                      path="/inventory/vulnerabilities"
-                      exact
-                      component={Vulnerabilities}
-                      permissions={['globalView', 'regionalAdmin', 'standard']}
-                    />
-                    <RouteGuard
-                      path="/inventory/vulnerabilities/grouped"
-                      component={(props) => (
-                        <Vulnerabilities {...props} groupBy="title" />
-                      )}
-                      permissions={['globalView', 'regionalAdmin', 'standard']}
-                    />
-                    <RouteGuard
-                      path="/inventory/vulnerability/:vulnerabilityId"
-                      component={Vulnerability}
-                      permissions={['globalView', 'regionalAdmin', 'standard']}
-                    />
-                    <RouteGuard
-                      path="/feeds"
-                      component={Feeds}
-                      permissions={['globalView']}
-                    />
-                    <RouteGuard
-                      path="/reports"
-                      component={Reports}
-                      permissions={['globalView', 'regionalAdmin', 'standard']}
-                    />
-                    <RouteGuard path="/admin-tools" component={AdminTools} />
-                    <RouteGuard
-                      path="/organizations/:organizationId"
-                      component={Organization}
-                      permissions={['globalView', 'regionalAdmin']}
-                    />
-                    <RouteGuard
-                      path="/organizations"
-                      component={Organizations}
-                      permissions={['globalView', 'regionalAdmin', 'standard']}
-                    />
-                    <RouteGuard
-                      path="/users"
-                      component={Users}
-                      permissions={['globalView', 'regionalAdmin']}
-                    />
-                    <RouteGuard
-                      path="/settings"
-                      component={Settings}
-                      permissions={['globalView', 'regionalAdmin', 'standard']}
-                    />
-                    <RouteGuard
-                      path="/region-admin-dashboard"
-                      component={RegionUsers}
-                      permissions={['regionalAdmin', 'globalView']}
-                    />
-                    <RouteGuard
-                      exact
-                      path="/readysetcyber"
-                      render={() => <Redirect to="/readysetcyber/dashboard" />}
-                      unauth={RSCLogin}
-                      component={RSCDashboard}
-                    />
-                    <RouteGuard
-                      exact
-                      path="/readysetcyber/create-account"
-                      render={() => <Redirect to="/readysetcyber/dashboard" />}
-                      unauth={RSCAuthLoginCreate}
-                      component={RSCDashboard}
-                    />
-                    <RouteGuard
-                      exact
-                      path="/readysetcyber/dashboard"
-                      component={RSCDashboard}
-                      render={() => <Redirect to="/readysetcyber/dashboard" />}
-                      permissions={[
-                        'globalView',
-                        'readySetCyber',
-                        'regionalAdmin',
-                        'standard'
-                      ]}
-                      unauth={RSCLogin}
-                    />
-                    <RouteGuard
-                      path="/readysetcyber/result/:id"
-                      component={RSCDetail}
-                      permissions={[
-                        'globalView',
-                        'readySetCyber',
-                        'regionalAdmin',
-                        'standard'
-                      ]}
-                      unauth={RSCLogin}
-                    />
-                  </Switch>
-                </LayoutWithSearch>
-              </SearchProvider>
+              <SavedSearchContextProvider>
+                <SearchProvider>
+                  <LayoutWithSearch>
+                    <LinkTracker />
+                    <Switch>
+                      <RouteGuard
+                        exact
+                        path="/"
+                        unauth={AuthLogin}
+                        component={RiskWithSearch}
+                      />
+                      <Route
+                        exact
+                        path="/login-gov-callback"
+                        component={LoginGovCallback}
+                      />
+                      <Route
+                        exact
+                        path="/okta-callback"
+                        component={OktaCallback}
+                      />
+                      <Route
+                        exact
+                        path="/create-account"
+                        component={AuthCreateAccount}
+                      />
+                      <Route exact path="/terms" component={TermsOfUse} />
+                      <RouteGuard
+                        exact
+                        path="/inventory"
+                        component={SearchPage}
+                        permissions={[
+                          'globalView',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                      />
+                      <RouteGuard
+                        path="/inventory/domain/:domainId"
+                        component={Domain}
+                        permissions={[
+                          'globalView',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                      />
+                      <RouteGuard
+                        path="/inventory/domains"
+                        component={Domains}
+                      />
+                      <RouteGuard
+                        path="/inventory/vulnerabilities"
+                        exact
+                        component={Vulnerabilities}
+                        permissions={[
+                          'globalView',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                      />
+                      <RouteGuard
+                        path="/inventory/vulnerabilities/grouped"
+                        component={(props) => (
+                          <Vulnerabilities {...props} groupBy="title" />
+                        )}
+                        permissions={[
+                          'globalView',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                      />
+                      <RouteGuard
+                        path="/inventory/vulnerability/:vulnerabilityId"
+                        component={Vulnerability}
+                        permissions={[
+                          'globalView',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                      />
+                      <RouteGuard
+                        path="/feeds"
+                        component={Feeds}
+                        permissions={['globalView']}
+                      />
+                      <RouteGuard
+                        path="/reports"
+                        component={Reports}
+                        permissions={[
+                          'globalView',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                      />
+                      <RouteGuard path="/admin-tools" component={AdminTools} />
+                      <RouteGuard
+                        path="/organizations/:organizationId"
+                        component={Organization}
+                        permissions={['globalView', 'regionalAdmin']}
+                      />
+                      <RouteGuard
+                        path="/organizations"
+                        component={Organizations}
+                        permissions={[
+                          'globalView',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                      />
+                      <RouteGuard
+                        path="/users"
+                        component={Users}
+                        permissions={['globalView', 'regionalAdmin']}
+                      />
+                      <RouteGuard
+                        path="/settings"
+                        component={Settings}
+                        permissions={[
+                          'globalView',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                      />
+                      <RouteGuard
+                        path="/region-admin-dashboard"
+                        component={RegionUsers}
+                        permissions={['regionalAdmin', 'globalView']}
+                      />
+                      <RouteGuard
+                        exact
+                        path="/readysetcyber"
+                        unauth={RSCLogin}
+                        component={RSCDashboard}
+                      />
+                      <RouteGuard
+                        exact
+                        path="/readysetcyber/create-account"
+                        unauth={RSCAuthLoginCreate}
+                        component={RSCDashboard}
+                      />
+                      <RouteGuard
+                        exact
+                        path="/readysetcyber/dashboard"
+                        component={RSCDashboard}
+                        permissions={[
+                          'globalView',
+                          'readySetCyber',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                        unauth={RSCLogin}
+                      />
+                      <RouteGuard
+                        path="/readysetcyber/result/:id"
+                        component={RSCDetail}
+                        permissions={[
+                          'globalView',
+                          'readySetCyber',
+                          'regionalAdmin',
+                          'standard'
+                        ]}
+                        unauth={RSCLogin}
+                      />
+                    </Switch>
+                  </LayoutWithSearch>
+                </SearchProvider>
+              </SavedSearchContextProvider>
             </StaticsContextProvider>
           </Authenticator.Provider>
         </AuthContextProvider>
diff --git a/frontend/src/assets/nvd.jpeg b/frontend/src/assets/nvd.jpeg
new file mode 100644
index 00000000..a0f85975
Binary files /dev/null and b/frontend/src/assets/nvd.jpeg differ
diff --git a/frontend/src/components/DrawerInterior.tsx b/frontend/src/components/DrawerInterior.tsx
index 1777496e..3b43e432 100644
--- a/frontend/src/components/DrawerInterior.tsx
+++ b/frontend/src/components/DrawerInterior.tsx
@@ -1,18 +1,21 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useMemo } from 'react';
 import {
   AccordionDetails,
   Accordion as MuiAccordion,
   AccordionSummary as MuiAccordionSummary,
   IconButton,
-  Paper,
   Divider,
   Stack,
   Toolbar,
   Typography,
   Box,
-  Button
+  Button,
+  List,
+  FormControlLabel,
+  ListItem,
+  FormGroup,
+  Radio
 } from '@mui/material';
-import { DataGrid } from '@mui/x-data-grid';
 import {
   classes,
   StyledWrapper
@@ -20,15 +23,14 @@ import {
 import {
   Delete,
   ExpandMore,
-  FiberManualRecordRounded
+  FiberManualRecordRounded,
+  FilterAlt,
+  Save
 } from '@mui/icons-material';
-import FilterAltIcon from '@mui/icons-material/FilterAlt';
-import { SearchBar } from 'components';
-import { TaggedArrayInput, FacetFilter } from 'components';
+import { FacetFilter, TaggedArrayInput } from 'components';
 import { ContextType } from '../context/SearchProvider';
-import { SavedSearch } from '../types/saved-search';
 import { useAuthContext } from '../context';
-import { useHistory, useLocation } from 'react-router-dom';
+import { useSavedSearchContext } from 'context/SavedSearchContext';
 import { withSearch } from '@elastic/react-search-ui';
 
 interface Props {
@@ -39,6 +41,7 @@ interface Props {
   clearFilters: ContextType['clearFilters'];
   searchTerm: ContextType['searchTerm'];
   setSearchTerm: ContextType['setSearchTerm'];
+  initialFilters: any[];
 }
 
 const FiltersApplied: React.FC = () => {
@@ -59,27 +62,18 @@ export const DrawerInterior: React.FC<Props> = (props) => {
     removeFilter,
     facets,
     clearFilters,
-    searchTerm,
-    setSearchTerm
+    setSearchTerm,
+    initialFilters
   } = props;
   const { apiGet, apiDelete } = useAuthContext();
-  const [savedSearches, setSavedSearches] = useState<SavedSearch[]>([]);
-  const [savedSearchCount, setSavedSearchCount] = useState(0);
-  const history = useHistory();
-  const location = useLocation();
 
-  useEffect(() => {
-    const fetchSearches = async () => {
-      try {
-        const response = await apiGet('/saved-searches');
-        setSavedSearches(response.result);
-        setSavedSearchCount(response.result.length);
-      } catch (error) {
-        console.error('Error fetching searches:', error);
-      }
-    };
-    fetchSearches();
-  }, [apiGet]);
+  const {
+    savedSearches,
+    setSavedSearches,
+    setSavedSearchCount,
+    activeSearchId,
+    setActiveSearchId
+  } = useSavedSearchContext();
 
   const deleteSearch = async (id: string) => {
     try {
@@ -87,10 +81,62 @@ export const DrawerInterior: React.FC<Props> = (props) => {
       const updatedSearches = await apiGet('/saved-searches'); // Get current saved searches
       setSavedSearches(updatedSearches.result); // Update the saved searches
       setSavedSearchCount(updatedSearches.result.length); // Update the count
+      localStorage.removeItem('savedSearch');
     } catch (e) {
       console.log(e);
     }
   };
+  const displaySavedSearch = (id: string) => {
+    const savedSearch = savedSearches.find((search) => search.id === id);
+    if (savedSearch) {
+      setSearchTerm(savedSearch.searchTerm, {
+        shouldClearFilters: true,
+        autocompleteResults: false
+      });
+    }
+
+    savedSearch?.filters?.forEach((filter) => {
+      filter.values.forEach((value: string) => {
+        addFilter(filter.field, value, 'any');
+      });
+    });
+    setActiveSearchId(id);
+  };
+  const restoreInitialFilters = () => {
+    initialFilters.forEach((filter) => {
+      filter.values.forEach((value: string) => {
+        addFilter(filter.field, value, 'any');
+      });
+    });
+  };
+
+  const revertSearch = () => {
+    setSearchTerm('', {
+      shouldClearFilters: true,
+      autocompleteResults: false
+    });
+    restoreInitialFilters();
+    setActiveSearchId('');
+  };
+  const toggleSavedSearches = (id: string) => {
+    const savedSearch = savedSearches.filter((search) => search.id === id);
+
+    if (savedSearch) {
+      if (!isSavedSearchActive(id)) {
+        displaySavedSearch(id);
+      } else {
+        revertSearch();
+      }
+    }
+  };
+
+  const isSavedSearchActive = (id: string): boolean => {
+    return activeSearchId === id;
+  };
+
+  const ascendingSavedSearches = savedSearches.sort((a, b) =>
+    a.name.localeCompare(b.name)
+  );
 
   const filtersByColumn = useMemo(
     () =>
@@ -133,24 +179,11 @@ export const DrawerInterior: React.FC<Props> = (props) => {
           <Typography variant="h6" component="h3">
             Advanced Filters
           </Typography>
-          <FilterAltIcon />
+          <FilterAlt />
         </Stack>
       </Toolbar>
       <Divider />
-      <div className={classes.header}>
-        <SearchBar
-          initialValue={searchTerm}
-          value={searchTerm}
-          onChange={(value) => {
-            if (location.pathname !== '/inventory')
-              history.push('/inventory?q=' + value);
-            setSearchTerm(value, {
-              shouldClearFilters: false,
-              autocompleteResults: false
-            });
-          }}
-        />
-      </div>
+
       {clearFilters && (
         <Box display="flex" width="100%" justifyContent="center">
           <Button onClick={clearFilters}>Clear All Filters</Button>
@@ -365,140 +398,56 @@ export const DrawerInterior: React.FC<Props> = (props) => {
           </AccordionDetails>
         </Accordion>
       )}
-      <Accordion
-        elevation={0}
-        square
-        classes={{
-          root: classes.root,
-          disabled: classes.disabled,
-          expanded: classes.expanded
-        }}
-      >
-        <AccordionSummary
-          expandIcon={<ExpandMore />}
-          classes={{
-            root: classes.root2,
-            content: classes.content,
-            disabled: classes.disabled2,
-            expanded: classes.expanded2
-          }}
-        >
-          <div className={classes.header}>
-            <h3>Saved Searches</h3>
-          </div>
+      <Toolbar sx={{ justifyContent: 'center' }}>
+        <Stack direction="row" spacing={2} alignItems="center">
+          <Typography variant="h6" component="h3">
+            Saved Searches
+          </Typography>
+          <Save />
+        </Stack>
+      </Toolbar>
+      <Divider />
+      <Accordion>
+        <AccordionSummary expandIcon={<ExpandMore />}>
+          <Typography>Saved Searches</Typography>
         </AccordionSummary>
-        <Accordion style={{ overflowY: 'auto' }}>
-          <AccordionDetails classes={{ root: classes.details }}>
-            <Paper elevation={2} style={{ width: '15em' }}>
-              {savedSearches.length > 0 ? (
-                <DataGrid
-                  density="compact"
-                  key={'Data Grid'}
-                  rows={savedSearches.map((search) => ({ ...search }))}
-                  rowCount={savedSearchCount}
-                  columns={[
-                    {
-                      field: 'name',
-                      headerName: 'Name',
-                      flex: 1,
-                      width: 100,
-                      description: 'Name',
-                      renderCell: (cellValues) => {
-                        const applyFilter = () => {
-                          // if (clearFilters) clearFilters();
-                          localStorage.setItem(
-                            'savedSearch',
-                            JSON.stringify(cellValues.row)
-                          );
-                          setSearchTerm(cellValues.row.searchTerm, {
-                            shouldClearFilters: false,
-                            autocompleteResults: false
-                          });
-                          if (location.pathname !== '/inventory')
-                            history.push(
-                              '/inventory?q=' + cellValues.row.searchTerm
-                            );
-
-                          // Apply the filters
-                          cellValues.row.filters.forEach((filter) => {
-                            filter.values.forEach((value) => {
-                              addFilter(filter.field, value, 'any');
-                            });
-                          });
-                        };
-                        return (
-                          <div
-                            aria-label={cellValues.row.name}
-                            title={`Saved Search: ${cellValues.row.name}`}
-                            tabIndex={0}
-                            onClick={applyFilter}
-                            onKeyDown={(e) => {
-                              if (e.key === 'Enter') {
-                                applyFilter();
-                              }
-                            }}
-                            style={{
-                              cursor: 'pointer',
-                              textAlign: 'left',
-                              width: '100%'
-                            }}
-                          >
-                            {cellValues.value}
-                          </div>
-                        );
-                      }
-                    },
-                    {
-                      field: 'actions',
-                      headerName: '',
-                      flex: 0.1,
-                      renderCell: (cellValues) => {
-                        const searchId = cellValues.id.toString();
-                        return (
-                          <div style={{ display: 'flexbox', textAlign: 'end' }}>
-                            <IconButton
-                              aria-label="Delete"
-                              title="Delete Search"
-                              onClick={(e) => {
-                                e.stopPropagation();
-                                deleteSearch(searchId);
-                              }}
-                              tabIndex={0}
-                              onKeyDown={(e) => {
-                                if (e.key === 'Enter') {
-                                  deleteSearch(searchId);
-                                }
-                              }}
-                            >
-                              <Delete />
-                            </IconButton>
-                          </div>
-                        );
-                      }
-                    }
-                  ]}
-                  initialState={{
-                    pagination: {
-                      paginationModel: {
-                        pageSize: 5
+        <AccordionDetails>
+          {ascendingSavedSearches.length > 0 ? (
+            <List>
+              {ascendingSavedSearches.map((search) => (
+                <ListItem
+                  key={search.id}
+                  sx={{ justifyContent: 'space-between', padding: '0px' }}
+                >
+                  <FormGroup>
+                    <FormControlLabel
+                      control={
+                        <Radio onClick={() => toggleSavedSearches(search.id)} />
                       }
-                    }
-                  }}
-                  pageSizeOptions={[5, 10]}
-                  disableRowSelectionOnClick
-                  sx={{
-                    disableColumnfilter: 'true',
-                    '& .MuiDataGrid-row:hover': {
-                      cursor: 'pointer'
-                    }
-                  }}
-                />
-              ) : (
-                <div>No Saved Searches</div>
-              )}
-            </Paper>
-          </AccordionDetails>
-        </Accordion>
+                      label={search.name}
+                      sx={{ padding: '0px' }}
+                      value={search.id}
+                      checked={isSavedSearchActive(search.id)}
+                    />
+                  </FormGroup>
+                  <IconButton
+                    aria-label="Delete"
+                    title="Delete Search"
+                    onClick={() => deleteSearch(search.id)}
+                  >
+                    <Delete />
+                  </IconButton>
+                </ListItem>
+              ))}
+            </List>
+          ) : (
+            <List>
+              <ListItem sx={{ alignItems: 'center', justifyContent: 'center' }}>
+                No Saved Searches
+              </ListItem>
+            </List>
+          )}
+        </AccordionDetails>
       </Accordion>
     </StyledWrapper>
   );
diff --git a/frontend/src/components/FilterDrawerV2.tsx b/frontend/src/components/FilterDrawerV2.tsx
index abdcc9a5..20bfe0a4 100644
--- a/frontend/src/components/FilterDrawerV2.tsx
+++ b/frontend/src/components/FilterDrawerV2.tsx
@@ -4,7 +4,7 @@ import { withSearch } from '@elastic/react-search-ui';
 import Box from '@mui/material/Box';
 import Drawer from '@mui/material/Drawer';
 import { DrawerInterior } from './DrawerInterior';
-import { OrganizationSearch } from './OrganizationSearch';
+import { RegionAndOrganizationFilters } from './RegionAndOrganizationFilters';
 import FilterAltIcon from '@mui/icons-material/FilterAlt';
 import { matchPath } from 'utils/matchPath';
 import { useLocation } from 'react-router-dom';
@@ -18,6 +18,7 @@ export const FilterDrawer: FC<
     isFilterDrawerOpen: boolean;
     isMobile: boolean;
     setIsFilterDrawerOpen: (isOpen: boolean) => void;
+    initialFilters: any[];
   }
 > = (props) => {
   const {
@@ -30,7 +31,8 @@ export const FilterDrawer: FC<
     clearFilters,
     searchTerm,
     setSearchTerm,
-    filters
+    filters,
+    initialFilters
   } = props;
   const { pathname } = useLocation();
 
@@ -44,10 +46,12 @@ export const FilterDrawer: FC<
           <FilterAltIcon />
         </Stack>
       </Toolbar>
-      <OrganizationSearch
+      <RegionAndOrganizationFilters
         addFilter={addFilter}
         removeFilter={removeFilter}
         filters={filters}
+        setSearchTerm={setSearchTerm}
+        searchTerm={searchTerm}
       />
       {matchPath(
         ['/inventory', '/inventory/domains', '/inventory/vulnerabilities'],
@@ -61,6 +65,7 @@ export const FilterDrawer: FC<
           clearFilters={filters.length > 0 ? () => clearFilters([]) : undefined}
           searchTerm={searchTerm}
           setSearchTerm={setSearchTerm}
+          initialFilters={initialFilters}
         />
       ) : (
         <></>
diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
index 83704996..fcfb91df 100644
--- a/frontend/src/components/Header.tsx
+++ b/frontend/src/components/Header.tsx
@@ -7,7 +7,10 @@ import {
   IconButton,
   Drawer,
   ListItem,
-  List
+  List,
+  Box,
+  Typography,
+  useMediaQuery
 } from '@mui/material';
 import { ChevronLeft, FilterAlt, Menu as MenuIcon } from '@mui/icons-material';
 import { NavItem } from './NavItem';
@@ -16,123 +19,10 @@ import logo from '../assets/cyhydashboard.svg';
 import cisaLogo from '../assets/cisaSeal.svg';
 import { UserMenu } from './UserMenu';
 import { matchPath } from 'utils/matchPath';
+import { useTheme } from '@mui/system';
+import { useUserLevel } from 'hooks/useUserLevel';
 
-const PREFIX = 'Header';
-
-const classes = {
-  inner: `${PREFIX}-inner`,
-  menuButton: `${PREFIX}-menuButton`,
-  logo: `${PREFIX}-logo`,
-  cisaLogo: `${PREFIX}-1cisaLogo`,
-  spacing: `${PREFIX}-spacing`,
-  activeMobileLink: `${PREFIX}-activeMobileLink`,
-  link: `${PREFIX}-link`,
-  userLink: `${PREFIX}-userLink`,
-  lgNav: `${PREFIX}-lgNav`,
-  selectOrg: `${PREFIX}-selectOrg`,
-  option: `${PREFIX}-option`
-};
-
-const Root = styled('div')(({ theme }) => ({
-  [`.${classes.inner}`]: {
-    maxWidth: '1440px',
-    width: '100%',
-    margin: '0 auto'
-  },
-
-  [`.${classes.menuButton}`]: {
-    marginLeft: theme.spacing(2),
-    display: 'flex'
-  },
-  [`.${classes.cisaLogo}`]: {
-    height: 40,
-    marginRight: theme.spacing(1)
-  },
-  [`.${classes.logo}`]: {
-    width: 175,
-    minWidth: 175,
-    padding: theme.spacing(),
-    paddingLeft: 0,
-    [theme.breakpoints.down('xl')]: {
-      display: 'flex'
-    }
-  },
-  [`.${classes.spacing}`]: {
-    flexGrow: 1
-  },
-  [`.${classes.activeMobileLink}`]: {
-    fontWeight: 700,
-    '&:after': {
-      content: "''",
-      position: 'absolute',
-      top: 0,
-      bottom: 0,
-      left: 0,
-      height: '100%',
-      width: 2,
-      backgroundColor: theme.palette.primary.main
-    }
-  },
-
-  [`.${classes.link}`]: {
-    position: 'relative',
-    color: 'white',
-    textDecoration: 'none',
-    margin: `0 ${theme.spacing()}px`,
-    padding: theme.spacing(),
-    borderBottom: '2px solid transparent',
-    fontWeight: 600
-  },
-  [`.${classes.userLink}`]: {
-    [theme.breakpoints.down('md')]: {
-      display: 'flex'
-    },
-    [theme.breakpoints.up('lg')]: {
-      display: 'flex',
-      alignItems: 'center',
-      marginLeft: '1rem',
-      '& svg': {
-        marginRight: theme.spacing()
-      },
-      border: 'none',
-      textDecoration: 'none'
-    }
-  },
-  [`.${classes.lgNav}`]: {
-    display: 'flex',
-    [theme.breakpoints.down('sm')]: {
-      display: 'flex'
-    }
-  },
-
-  [`.${classes.selectOrg}`]: {
-    border: '1px solid #FFFFFF',
-    borderRadius: '5px',
-    width: '200px',
-    padding: '3px',
-    marginLeft: '20px',
-    '& svg': {
-      color: 'white'
-    },
-    '& input': {
-      color: 'white',
-      width: '100%'
-    },
-    '& input:focus': {
-      outlineWidth: 0
-    },
-    '& fieldset': {
-      borderStyle: 'none'
-    },
-    '& div div': {
-      paddingTop: '0 !important'
-    },
-    '& div div div': {
-      marginTop: '-3px !important'
-    },
-    height: '45px'
-  }
-}));
+const Root = styled('div')(() => ({}));
 
 const GLOBAL_ADMIN = 3;
 const REGIONAL_ADMIN = 2;
@@ -165,6 +55,7 @@ export const Header: React.FC<HeaderProps> = ({
 }) => {
   const { pathname } = useLocation();
   const { user, logout } = useAuthContext();
+  const theme = useTheme();
 
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [isMobile, setIsMobile] = useState(false);
@@ -174,19 +65,7 @@ export const Header: React.FC<HeaderProps> = ({
     setDrawerOpen(newOpen);
   };
 
-  let userLevel = 0;
-  if (user && user.isRegistered) {
-    if (user.userType === 'standard') {
-      userLevel = STANDARD_USER;
-    } else if (user.userType === 'globalAdmin') {
-      userLevel = GLOBAL_ADMIN;
-    } else if (
-      user.userType === 'regionalAdmin' ||
-      user.userType === 'globalView'
-    ) {
-      userLevel = REGIONAL_ADMIN;
-    }
-  }
+  const { userLevel, formattedUserType } = useUserLevel();
 
   const navItems: NavItemType[] = [
     {
@@ -272,51 +151,111 @@ export const Header: React.FC<HeaderProps> = ({
     drawerItems = [...navItems, ...userMenuItems];
   }
 
+  const isSmallerThanMds = useMediaQuery(theme.breakpoints.down('mds'));
+
   return (
     <Root>
       <AppBar position="static" elevation={0}>
-        <div className={classes.inner}>
-          <Toolbar>
-            {matchPath(['/', '/inventory'], pathname) && user ? (
-              <FilterDrawerButton
-                open={isFilterDrawerOpen}
-                setOpen={setIsFilterDrawerOpen}
-              />
-            ) : (
-              <></>
-            )}
-            <img
-              src={cisaLogo}
-              className={classes.cisaLogo}
-              alt="Cybersecurity and Infrastructure Security Agency Logo"
-            />
-            <Link to="/">
+        <Box
+          maxWidth="1440px"
+          display="flex"
+          width="100%"
+          height="100%"
+          margin="0 auto"
+          flexWrap="wrap"
+          alignItems="center"
+        >
+          <Toolbar sx={{ width: '100%', display: 'flex' }}>
+            <Box
+              display="flex"
+              flexDirection="row"
+              width="100%"
+              alignItems="center"
+            >
+              {matchPath(['/', '/inventory'], pathname) && user ? (
+                <FilterDrawerButton
+                  open={isFilterDrawerOpen}
+                  setOpen={setIsFilterDrawerOpen}
+                />
+              ) : (
+                <></>
+              )}
               <img
-                src={logo}
-                className={classes.logo}
-                alt="CyHy Dashboard Icon Navigate Home"
+                src={cisaLogo}
+                style={{
+                  height: 40,
+                  marginRight: theme.spacing(1)
+                }}
+                alt="Cybersecurity and Infrastructure Security Agency Logo"
               />
-            </Link>
-            {!isMobile && (
-              <div className={classes.lgNav}>{desktopNavItems.slice()}</div>
-            )}
-            <div className={classes.spacing} />
-            {userLevel > 0 && (
-              <>{!isMobile && <UserMenu userMenuItems={userMenuItems} />}</>
-            )}
-            {user && isMobile && (
-              <IconButton
-                edge="start"
-                className={classes.menuButton}
-                aria-label="toggle mobile menu"
-                color="inherit"
-                onClick={toggleDrawer(true)}
+              <Link to="/" style={{ width: 'min-content', height: '30px' }}>
+                <img
+                  src={logo}
+                  style={{
+                    width: 175,
+                    maxWidth: 175,
+                    padding: theme.spacing(),
+                    paddingLeft: 0
+                  }}
+                  alt="CyHy Dashboard Icon Navigate Home"
+                />
+              </Link>
+              {!isMobile && (
+                <Box
+                  display="flex"
+                  width="max-content"
+                  sx={{
+                    [theme.breakpoints.down('sm')]: {
+                      display: 'flex'
+                    }
+                  }}
+                >
+                  {desktopNavItems.slice()}
+                </Box>
+              )}
+            </Box>
+            {!isSmallerThanMds ? (
+              <Box
+                textTransform="uppercase"
+                display="flex"
+                width="auto"
+                minWidth="max-content"
               >
-                <MenuIcon />
-              </IconButton>
+                {user && userLevel > 0 ? (
+                  <Typography>{formattedUserType}</Typography>
+                ) : (
+                  <></>
+                )}
+              </Box>
+            ) : (
+              <></>
             )}
+            <Box
+              display="flex"
+              flexDirection="row"
+              width="100%"
+              justifyContent="end"
+            >
+              {userLevel > 0 && (
+                <>{!isMobile && <UserMenu userMenuItems={userMenuItems} />}</>
+              )}
+              {user && isMobile && (
+                <IconButton
+                  edge="start"
+                  style={{
+                    marginLeft: theme.spacing(2),
+                    display: 'flex'
+                  }}
+                  aria-label="toggle mobile menu"
+                  color="inherit"
+                  onClick={toggleDrawer(true)}
+                >
+                  <MenuIcon />
+                </IconButton>
+              )}
+            </Box>
           </Toolbar>
-        </div>
+        </Box>
       </AppBar>
       <Drawer
         anchor="right"
@@ -339,7 +278,6 @@ export const Header: React.FC<HeaderProps> = ({
                   exact
                   component={NavLink}
                   to={path}
-                  activeClassName={classes.activeMobileLink}
                 >
                   {title}
                 </ListItem>
diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx
index e9c8fc58..942f2a82 100644
--- a/frontend/src/components/Layout.tsx
+++ b/frontend/src/components/Layout.tsx
@@ -8,7 +8,7 @@ import React, {
 import { styled } from '@mui/material/styles';
 import { useLocation } from 'react-router-dom';
 import { Box, Drawer, ScopedCssBaseline, useMediaQuery } from '@mui/material';
-import { Header, GovBanner } from 'components';
+import { GovBanner, Header } from 'components';
 import { useUserActivityTimeout } from 'hooks/useUserActivityTimeout';
 import { useAuthContext } from 'context/AuthContext';
 import UserInactiveModal from './UserInactivityModal/UserInactivityModal';
@@ -77,6 +77,8 @@ export const Layout: React.FC<PropsWithChildren<ContextType>> = ({
 
   const { regions } = useStaticsContext();
 
+  const [initialFilters, setInitialFilters] = useState<any[]>([]);
+
   const theme = useTheme();
   const [isFilterDrawerOpen, setIsFilterDrawerOpen] = usePersistentState(
     'isFilterDrawerOpen',
@@ -141,6 +143,7 @@ export const Layout: React.FC<PropsWithChildren<ContextType>> = ({
       filter.values.forEach((val) => {
         addFilter(filter.field, val, filter.type);
       });
+      setInitialFilters(initialFiltersForUser);
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [regions, user]);
@@ -173,6 +176,7 @@ export const Layout: React.FC<PropsWithChildren<ContextType>> = ({
                   setIsFilterDrawerOpen={setIsFilterDrawerOpen}
                   isFilterDrawerOpen={isFilterDrawerOpen}
                   isMobile={isMobile}
+                  initialFilters={initialFilters}
                 />
               ) : (
                 <Drawer
@@ -189,6 +193,8 @@ export const Layout: React.FC<PropsWithChildren<ContextType>> = ({
                   isFilterDrawerOpen={isFilterDrawerOpen}
                   setIsFilterDrawerOpen={setIsFilterDrawerOpen}
                 />
+                <div className="main-content" id="main-content" tabIndex={-1} />
+
                 <Box
                   display="block"
                   position="relative"
diff --git a/frontend/src/components/Logs/Logs.tsx b/frontend/src/components/Logs/Logs.tsx
new file mode 100644
index 00000000..57278e2e
--- /dev/null
+++ b/frontend/src/components/Logs/Logs.tsx
@@ -0,0 +1,205 @@
+import {
+  Dialog,
+  DialogContent,
+  DialogTitle,
+  Icon,
+  IconButton,
+  Paper
+} from '@mui/material';
+import { Box } from '@mui/system';
+import {
+  DataGrid,
+  GridColDef,
+  GridFilterItem,
+  GridRenderEditCellParams,
+  GridToolbar,
+  GridToolbarColumnsButton,
+  GridToolbarDensitySelector,
+  GridToolbarFilterButton
+} from '@mui/x-data-grid';
+import { useAuthContext } from 'context';
+import { differenceInCalendarDays, parseISO } from 'date-fns';
+import React, { FC, useCallback, useEffect, useState } from 'react';
+
+interface LogsProps {}
+
+interface LogDetails {
+  createdAt: string;
+  eventType: string;
+  result: string;
+  payload: string;
+}
+
+const CustomToolbar = () => {
+  return (
+    <GridToolbar>
+      <GridToolbarColumnsButton />
+      <GridToolbarFilterButton />
+      <GridToolbarDensitySelector />
+    </GridToolbar>
+  );
+};
+
+export const Logs: FC<LogsProps> = () => {
+  const { apiPost } = useAuthContext();
+  const [filters, setFilters] = useState<Array<GridFilterItem>>([]);
+  const [openDialog, setOpenDialog] = useState(false);
+  const [dialogDetails, setDialogDetails] = useState<
+    (LogDetails & { id: number }) | null
+  >(null);
+  const [logs, setLogs] = useState<{
+    count: Number;
+    result: Array<LogDetails>;
+  }>({
+    count: 0,
+    result: []
+  });
+
+  const fetchLogs = useCallback(async () => {
+    const tableFilters = filters.reduce(
+      (acc: { [key: string]: { value: any; operator: any } }, cur) => {
+        return {
+          ...acc,
+          [cur.field]: {
+            value: cur.value,
+            operator: cur.operator
+          }
+        };
+      },
+      {}
+    );
+    const results = await apiPost('/logs/search', {
+      body: {
+        ...tableFilters
+      }
+    });
+    setLogs(results);
+  }, [apiPost, filters]);
+
+  useEffect(() => {
+    fetchLogs();
+  }, [fetchLogs]);
+
+  const logCols: GridColDef[] = [
+    {
+      field: 'eventType',
+      headerName: 'Event',
+      minWidth: 100,
+      flex: 1
+    },
+    {
+      field: 'result',
+      headerName: 'Result',
+      minWidth: 100,
+      flex: 1
+    },
+    {
+      field: 'createdAt',
+      headerName: 'Timestamp',
+      type: 'dateTime',
+      minWidth: 100,
+      flex: 1,
+      valueFormatter: (e) => {
+        return `${differenceInCalendarDays(
+          Date.now(),
+          parseISO(e.value)
+        )} days ago`;
+      }
+    },
+    {
+      field: 'payload',
+      headerName: 'Payload',
+      description: 'Click any payload cell to expand.',
+      sortable: false,
+      minWidth: 300,
+      flex: 2,
+      renderCell: (cellValues) => {
+        return (
+          <Box
+            sx={{
+              fontSize: '12px',
+              padding: 0,
+              margin: 0,
+              backgroundColor: 'black',
+              color: 'white',
+              width: '100%'
+            }}
+          >
+            <pre>{JSON.stringify(cellValues.row.payload, null, 2)}</pre>
+          </Box>
+        );
+      },
+      valueFormatter: (e) => {
+        return JSON.stringify(e.value, null, 2);
+      }
+    },
+    {
+      field: 'details',
+      headerName: 'Details',
+      maxWidth: 70,
+      flex: 1,
+      renderCell: (cellValues: GridRenderEditCellParams) => {
+        return (
+          <IconButton
+            aria-label={`Details for scan task ${cellValues.row.id}`}
+            tabIndex={cellValues.tabIndex}
+            color="primary"
+            onClick={() => {
+              setOpenDialog(true);
+              setDialogDetails(cellValues.row);
+            }}
+          >
+            <Icon>info</Icon>
+          </IconButton>
+        );
+      }
+    }
+  ];
+
+  useEffect(() => {
+    fetchLogs();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [filters]);
+
+  return (
+    <Box>
+      <Paper elevation={2} sx={{ width: '100%' }}>
+        <DataGrid
+          rows={logs.result}
+          columns={logCols}
+          filterMode="server"
+          slots={{
+            toolbar: CustomToolbar
+          }}
+          slotProps={{ toolbar: { multifilter: true } }}
+          onFilterModelChange={(model) => {
+            setFilters(model.items);
+          }}
+        />
+        <Dialog
+          open={openDialog}
+          onClose={() => setOpenDialog(false)}
+          scroll="paper"
+          fullWidth
+          maxWidth="lg"
+        >
+          <DialogTitle>Payload Details</DialogTitle>
+          <DialogContent>
+            <Box
+              sx={{
+                fontSize: '12px',
+                padding: 2,
+                margin: 0,
+                backgroundColor: 'black',
+                color: 'white',
+                width: '100%'
+              }}
+            >
+              <pre>{JSON.stringify(dialogDetails?.payload, null, 2)}</pre>
+            </Box>
+          </DialogContent>
+        </Dialog>
+      </Paper>
+    </Box>
+  );
+};
diff --git a/frontend/src/components/ReadySetCyber/RSCRegisterForm.tsx b/frontend/src/components/ReadySetCyber/RSCRegisterForm.tsx
index 1626a794..0700e6a2 100644
--- a/frontend/src/components/ReadySetCyber/RSCRegisterForm.tsx
+++ b/frontend/src/components/ReadySetCyber/RSCRegisterForm.tsx
@@ -50,7 +50,6 @@ export const RSCRegisterForm: React.FC<{
       );
       const data = await response.json();
       // Handle the response data here
-      console.log(data);
       return data;
     } catch (error) {
       // Handle any errors here
diff --git a/frontend/src/components/OrganizationSearch.tsx b/frontend/src/components/RegionAndOrganizationFilters.tsx
similarity index 69%
rename from frontend/src/components/OrganizationSearch.tsx
rename to frontend/src/components/RegionAndOrganizationFilters.tsx
index 0db01414..d238c84f 100644
--- a/frontend/src/components/OrganizationSearch.tsx
+++ b/frontend/src/components/RegionAndOrganizationFilters.tsx
@@ -1,12 +1,12 @@
 import React, { useCallback, useMemo, useState, useEffect } from 'react';
 import { useAuthContext } from 'context';
-//Are we still using this?
-// import  {OrganizationTag} from 'types';
 import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
   Autocomplete,
+  Box,
+  Button,
   Checkbox,
   Divider,
   FormControlLabel,
@@ -17,9 +17,13 @@ import {
   Typography
 } from '@mui/material';
 import { ExpandMore } from '@mui/icons-material';
-import { debounce } from 'utils/debounce';
 import { useStaticsContext } from 'context/StaticsContext';
-import { REGIONAL_USER_CAN_SEARCH_OTHER_REGIONS } from 'hooks/useUserTypeFilters';
+import {
+  ORGANIZATION_EXCLUSIONS,
+  REGIONAL_USER_CAN_SEARCH_OTHER_REGIONS
+} from 'hooks/useUserTypeFilters';
+import { SearchBar } from './SearchBar';
+import { useHistory, useLocation } from 'react-router-dom';
 
 const GLOBAL_ADMIN = 3;
 const REGIONAL_ADMIN = 2;
@@ -38,7 +42,7 @@ export interface OrganizationShallow {
   rootDomains: string[];
 }
 
-interface OrganizationSearchProps {
+interface RegionAndOrganizationFiltersProps {
   addFilter: (
     name: string,
     value: any,
@@ -50,21 +54,25 @@ interface OrganizationSearchProps {
     filterType: 'all' | 'any' | 'none'
   ) => void;
   filters: any[];
+  setSearchTerm: (s: string, opts?: any) => void;
+  searchTerm: string;
 }
 
-export const OrganizationSearch: React.FC<OrganizationSearchProps> = ({
+export const RegionAndOrganizationFilters: React.FC<
+  RegionAndOrganizationFiltersProps
+> = ({
   addFilter,
   removeFilter,
-  filters
+  filters,
+  searchTerm: domainSearchTerm,
+  setSearchTerm: setDomainSearchTerm
 }) => {
   const { setShowMaps, user, apiPost } = useAuthContext();
 
   const { regions } = useStaticsContext();
-
-  //Are we still using this?
-  // const [tags, setTags] = useState<OrganizationTag[]>([]);
   const [searchTerm, setSearchTerm] = useState<string>('');
   const [orgResults, setOrgResults] = useState<OrganizationShallow[]>([]);
+  const [isOpen, setIsOpen] = useState(false);
 
   let userLevel = 0;
   if (user && user.isRegistered) {
@@ -91,8 +99,18 @@ export const OrganizationSearch: React.FC<OrganizationSearchProps> = ({
           }
         });
         const orgs = results.body.hits.hits.map((hit) => hit._source);
+        // Filter out organizations that match the exclusions
+        const refinedOrgs = orgs.filter((org) => {
+          let exlude = false;
+          ORGANIZATION_EXCLUSIONS.forEach((exc) => {
+            if (org.name.toLowerCase().includes(exc)) {
+              exlude = true;
+            }
+          });
+          return !exlude;
+        });
         // Filter out organizations that are already in the filters
-        const filteredOrgs = orgs.filter(
+        const filteredOrgs = refinedOrgs.filter(
           (org) =>
             !filters.find(
               (filter) =>
@@ -128,13 +146,8 @@ export const OrganizationSearch: React.FC<OrganizationSearchProps> = ({
     }
   };
 
-  const handleTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const newSearchTerm = e.target.value;
-    setSearchTerm(newSearchTerm);
-  };
-
-  const handleChange = (v: string) => {
-    debounce(searchOrganizations(v, regionFilterValues ?? []) as any, 400);
+  const handleTextChange = (v: string) => {
+    setSearchTerm(v);
   };
 
   useEffect(() => {
@@ -167,10 +180,49 @@ export const OrganizationSearch: React.FC<OrganizationSearchProps> = ({
     },
     [regionFilterValues]
   );
+  const history = useHistory();
+  const location = useLocation();
+
+  const handleAddOrganization = (org: OrganizationShallow) => {
+    if (org) {
+      const exists = organizationsInFilters?.find((o) => o.id === org.id);
+      if (exists) {
+        removeFilter(ORGANIZATION_FILTER_KEY, org, 'any');
+      } else {
+        addFilter(ORGANIZATION_FILTER_KEY, org, 'any');
+      }
+      setSearchTerm('');
+      setIsOpen(false);
+      if (org.name === 'Election') {
+        setShowMaps(true);
+      } else {
+        setShowMaps(false);
+      }
+    } else {
+    }
+  };
 
   return (
     <>
       <Divider />
+      <Box padding={2}>
+        <SearchBar
+          initialValue={domainSearchTerm}
+          value={domainSearchTerm}
+          onChange={(value) => {
+            if (location.pathname !== '/inventory') {
+              history.push(`/inventory?q=${value}`);
+              setDomainSearchTerm(value, {
+                shouldClearFilters: false,
+                refresh: true
+              });
+            }
+            setDomainSearchTerm(value, {
+              shouldClearFilters: false
+            });
+          }}
+        />
+      </Box>
       <Accordion
         expanded={userLevel === STANDARD_USER ? true : undefined}
         defaultExpanded
@@ -218,48 +270,69 @@ export const OrganizationSearch: React.FC<OrganizationSearchProps> = ({
           {/* Need to reconcile type issues caused by adding freeSolo prop */}
           {userLevel !== STANDARD_USER ? (
             <Autocomplete
-              onInputChange={(_, v) => handleChange(v)}
+              onInputChange={(e, v) => {
+                if (e && e.type === 'change') {
+                  handleTextChange(v);
+                }
+              }}
+              inputValue={searchTerm}
               // freeSolo
               disableClearable
+              open={isOpen}
+              onOpen={() => {
+                setIsOpen(true);
+              }}
               options={orgResults}
+              onChange={(e, v) => {
+                setTimeout(() => {
+                  handleAddOrganization(v);
+                }, 250);
+                return;
+              }}
               getOptionLabel={(option) => option.name}
+              ListboxProps={{
+                sx: {
+                  ':active': {
+                    bgcolor: 'transparent'
+                  }
+                }
+              }}
               renderOption={(params, option) => {
                 return (
-                  <li {...params} key={option.id}>
-                    {option.name}
+                  <li
+                    style={{ pointerEvents: 'none', padding: 0 }}
+                    key={option.id}
+                  >
+                    <Button
+                      sx={{
+                        pointerEvents: 'auto',
+                        height: '100%',
+                        width: '100%',
+                        display: 'flex',
+                        justifyContent: 'start',
+                        fontWeight: 400,
+                        color: 'black',
+                        textTransform: 'none'
+                      }}
+                      onClick={() =>
+                        setTimeout(() => {
+                          handleAddOrganization(option);
+                        }, 250)
+                      }
+                    >
+                      {option.name}
+                    </Button>
                   </li>
                 );
               }}
               isOptionEqualToValue={(option, value) =>
                 option?.name === value?.name
               }
-              onChange={(event, value) => {
-                if (value) {
-                  const exists = organizationsInFilters?.find(
-                    (org) => org.id === value.id
-                  );
-                  if (exists) {
-                    // setSelectedOrgs(selectedOrgs.filter((org) => org.id !== value.id))
-                    removeFilter(ORGANIZATION_FILTER_KEY, value, 'any');
-                  } else {
-                    // setSelectedOrgs([...selectedOrgs, value])
-                    addFilter(ORGANIZATION_FILTER_KEY, value, 'any');
-                  }
-                  setSearchTerm('');
-                  if (value.name === 'Election') {
-                    setShowMaps(true);
-                  } else {
-                    setShowMaps(false);
-                  }
-                } else {
-                }
-              }}
               renderInput={(params) => (
                 <TextField
                   {...params}
                   label="Search Organizations"
-                  value={searchTerm}
-                  onChange={handleTextChange}
+                  onBlur={() => setIsOpen(false)}
                 />
               )}
             />
diff --git a/frontend/src/components/RouteGuard.tsx b/frontend/src/components/RouteGuard.tsx
index da53cd88..5673cbf2 100644
--- a/frontend/src/components/RouteGuard.tsx
+++ b/frontend/src/components/RouteGuard.tsx
@@ -38,7 +38,6 @@ export const RouteGuard: React.FC<AuthRedirectRouteProps> = ({
 
   if (token && !user) {
     // waiting on user profile
-    console.log('Token Route Check');
     return null;
   }
 
diff --git a/frontend/src/components/SaveSearchModal/SaveSearchModal.tsx b/frontend/src/components/SaveSearchModal/SaveSearchModal.tsx
new file mode 100644
index 00000000..193613fd
--- /dev/null
+++ b/frontend/src/components/SaveSearchModal/SaveSearchModal.tsx
@@ -0,0 +1,348 @@
+import React, { useState } from 'react';
+import { useSavedSearchContext } from 'context/SavedSearchContext';
+import {
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  TextField,
+  Button,
+  Box
+} from '@mui/material/';
+import { SavedSearch } from '../../types/saved-search';
+import { useAuthContext } from '../../context';
+import { Save } from '@mui/icons-material';
+
+interface SaveSearchModalProps {
+  searchTerm: string;
+  filters: any;
+  totalResults: number;
+  sortField: string;
+  sortDirection: string;
+  advancedFiltersReq?: boolean;
+}
+
+export const SaveSearchModal: React.FC<SaveSearchModalProps> = (props) => {
+  const {
+    searchTerm,
+    filters,
+    totalResults,
+    sortField,
+    sortDirection,
+    advancedFiltersReq
+  } = props;
+  const [saveDialogOpen, setSaveDialogOpen] = useState(false);
+  const [updateDialogOpen, setUpdateDialogOpen] = useState(false);
+  const [formErrors, setFormErrors] = useState({
+    name: false,
+    duplicate: false
+  });
+  const { apiGet, apiPost, apiPut } = useAuthContext();
+  const { savedSearches, setSavedSearches, setSavedSearchCount, activeSearch } =
+    useSavedSearchContext();
+  const [savedSearchValues, setSavedSearchValues] = useState<
+    Partial<SavedSearch> & { name: string }
+  >(activeSearch ? activeSearch : { name: '' });
+  // API call to save/update saved searches
+  const handleSave = async (savedSearchValues: Partial<SavedSearch>) => {
+    const body = {
+      body: {
+        ...savedSearchValues,
+        searchTerm,
+        filters,
+        count: totalResults,
+        searchPath: window.location.search,
+        sortField,
+        sortDirection
+      }
+    };
+
+    try {
+      if (activeSearch) {
+        await apiPut('/saved-searches/' + activeSearch.id, body);
+      } else {
+        await apiPost('/saved-searches/', body);
+      }
+      const updatedSearches = await apiGet('/saved-searches'); // Get current saved searches
+      setSavedSearches(updatedSearches.result); // Update the saved searches
+      setSavedSearchCount(updatedSearches.result.length); // Update the count
+    } catch (e) {
+      console.error(e);
+    }
+  };
+
+  const handleCloseModal = () => {
+    setSaveDialogOpen(false);
+    savedSearchValues.name = '';
+  };
+  const handleOpenModal = () => {
+    setSaveDialogOpen(true);
+  };
+
+  const handleDialogClose = () => {
+    setUpdateDialogOpen(false);
+    savedSearchValues.name = '';
+  };
+
+  const handleUpdate = () => {
+    if (activeSearch) {
+      savedSearchValues.name = activeSearch.name;
+      setUpdateDialogOpen(true); // Open dialog to confirm update
+    } else {
+      handleOpenModal();
+    }
+  };
+
+  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+
+    if (formErrors.name) {
+      return;
+    }
+    handleSave(savedSearchValues);
+    handleCloseModal();
+  };
+
+  // Validate Saved Search Name
+  const validation = (name: string): boolean => {
+    const nameRegex = /^(?=.*[A-Za-z0-9])[A-Za-z0-9\s'-]+$/;
+    return nameRegex.test(name);
+  };
+
+  const handleChange = (textInputName: string, textInput: string) => {
+    setSavedSearchValues((inputValues) => ({
+      ...inputValues,
+      [textInputName]: textInput
+    }));
+    // Validation check for valid characters and duplicate names
+    if (textInputName === 'name' && textInput !== activeSearch?.name) {
+      const isValid = validation(textInput);
+      const isDuplicate = savedSearches.some(
+        (search) => search.name === textInput
+      );
+
+      setFormErrors((prev) => ({
+        ...prev,
+        name: !isValid,
+        duplicate: isDuplicate
+      }));
+    }
+  };
+
+  return (
+    <>
+      <Button
+        tabIndex={0}
+        variant="contained"
+        onClick={handleUpdate}
+        endIcon={<Save />}
+        disabled={!advancedFiltersReq}
+        aria-label={activeSearch ? 'Update Saved Search' : 'Save Search'}
+      >
+        {activeSearch ? 'Update Saved Search' : 'Save Search'}
+      </Button>
+      <Dialog
+        open={updateDialogOpen}
+        onClose={() => setUpdateDialogOpen(false)}
+        aria-label="Save Search form"
+        aria-labelledby="save-search-form-title"
+        aria-describedby="save-search-form-description"
+        PaperProps={{
+          component: 'form',
+          onSubmit: handleSubmit,
+          style: { width: '30%', minWidth: '300px' }
+        }}
+      >
+        <DialogTitle id="update-saved-search-title">
+          Update Saved Search
+        </DialogTitle>
+        <DialogContent>
+          <DialogContentText id="update-saved-search-description">
+            <TextField
+              autoFocus
+              required
+              margin="dense"
+              id="name"
+              name="name"
+              placeholder={activeSearch?.name}
+              type="text"
+              fullWidth
+              variant="outlined"
+              value={savedSearchValues.name}
+              onChange={(e) => handleChange(e.target.name, e.target.value)}
+              inputProps={{
+                'aria-label': 'Enter a name for your saved search'
+              }}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter' || e.key === ' ') {
+                  e.preventDefault();
+                }
+              }}
+              error={formErrors.name}
+              helperText={
+                formErrors.name
+                  ? 'Name is required and must contain only alphanumeric characters, spaces, hyphens, or apostrophes.'
+                  : formErrors.duplicate
+                  ? 'This name is already taken. Please choose a different name.'
+                  : ''
+              }
+            />
+          </DialogContentText>
+        </DialogContent>
+        <DialogActions>
+          <Button
+            tabIndex={0}
+            onClick={handleDialogClose}
+            color="primary"
+            onKeyDown={(e) => {
+              if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                try {
+                  handleDialogClose();
+                } catch (e) {
+                  console.error(e);
+                }
+              }
+            }}
+            aria-label="Cancel and close the dialog"
+          >
+            Cancel
+          </Button>
+          <Button
+            tabIndex={0}
+            variant="contained"
+            onClick={() => {
+              try {
+                handleSave(savedSearchValues);
+                setUpdateDialogOpen(false);
+                savedSearchValues.name = '';
+              } catch (e) {
+                console.error(e);
+              }
+            }}
+            disabled={
+              formErrors.name ||
+              formErrors.duplicate ||
+              !savedSearchValues.name.trim()
+            }
+            onKeyDown={(e) => {
+              if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                try {
+                  handleSave(savedSearchValues);
+                  setUpdateDialogOpen(false);
+                  savedSearchValues.name = '';
+                } catch (e) {
+                  console.error(e);
+                }
+              }
+            }}
+            color="primary"
+            autoFocus
+            aria-label="Save the search"
+          >
+            Save
+          </Button>
+        </DialogActions>
+      </Dialog>
+      <Dialog
+        open={saveDialogOpen}
+        onClose={handleCloseModal}
+        PaperProps={{
+          component: 'form',
+          onSubmit: handleSubmit,
+          style: { width: '30%', minWidth: '300px' }
+        }}
+        aria-label="Save Search"
+        aria-labelledby="save-search-dialog-title"
+        aria-describedby="dialog-description"
+      >
+        <DialogTitle id="dialog-title">Save Search</DialogTitle>
+        <DialogContent>
+          <Box paddingBottom={'1em'}>
+            <DialogContentText id="dialog-description">
+              Name Your Search
+            </DialogContentText>
+            <TextField
+              autoFocus
+              required
+              margin="dense"
+              id="name"
+              name="name"
+              placeholder="Enter a name"
+              type="text"
+              fullWidth
+              variant="outlined"
+              value={savedSearchValues.name}
+              onChange={(e) => handleChange(e.target.name, e.target.value)}
+              inputProps={{
+                'aria-label': 'Enter a name for your saved search'
+              }}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter' || e.key === ' ') {
+                  e.preventDefault();
+                }
+              }}
+              error={formErrors.name}
+              helperText={
+                formErrors.name
+                  ? 'Name is required and must contain only alphanumeric characters, spaces, hyphens, or apostrophes.'
+                  : formErrors.duplicate
+                  ? 'This name is already taken. Please choose a different name.'
+                  : ''
+              }
+            />
+          </Box>
+        </DialogContent>
+        <DialogActions>
+          <Button
+            tabIndex={0}
+            onClick={handleCloseModal}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                try {
+                  handleCloseModal();
+                } catch (e) {
+                  console.error(e);
+                }
+              }
+            }}
+            aria-label="Cancel and close the dialog"
+          >
+            Cancel
+          </Button>
+          <Button
+            tabIndex={0}
+            variant="contained"
+            type="submit"
+            disabled={
+              formErrors.name ||
+              formErrors.duplicate ||
+              !savedSearchValues.name.trim()
+            }
+            onKeyDown={(e) => {
+              if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                try {
+                  if (formErrors.name) {
+                    return;
+                  }
+                  handleSave(savedSearchValues);
+                  handleCloseModal();
+                } catch (e) {
+                  console.error(e);
+                }
+              }
+            }}
+            aria-label="Save the search"
+            color="primary"
+          >
+            Save
+          </Button>
+        </DialogActions>
+      </Dialog>
+    </>
+  );
+};
diff --git a/frontend/src/components/SearchBar.tsx b/frontend/src/components/SearchBar.tsx
index 136b48ee..4d41cac0 100644
--- a/frontend/src/components/SearchBar.tsx
+++ b/frontend/src/components/SearchBar.tsx
@@ -87,7 +87,7 @@ interface Props
   initialValue: string;
 }
 
-const defaultPlaceholder = 'Search a domain, vuln, port, service, IP';
+const defaultPlaceholder = 'Search by Domain or IP';
 
 type Timer = ReturnType<typeof setTimeout>;
 
diff --git a/frontend/src/components/SkipToMainContent/SkipToMainContent.tsx b/frontend/src/components/SkipToMainContent/SkipToMainContent.tsx
index 0fa119b9..f98a6e8f 100644
--- a/frontend/src/components/SkipToMainContent/SkipToMainContent.tsx
+++ b/frontend/src/components/SkipToMainContent/SkipToMainContent.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Box, Button, Tooltip } from '@mui/material';
+import { Box, Button } from '@mui/material';
 
 export const SkipToMainContent: React.FC = () => {
   const handleClick = (event: any) => {
@@ -12,21 +12,19 @@ export const SkipToMainContent: React.FC = () => {
 
   return (
     <Box sx={{ paddingLeft: 1 }}>
-      <Tooltip title="Skip to main content" placement="right">
-        <Button
-          aria-label="Skip to main content"
-          variant="text"
-          tabIndex={0}
-          onClick={handleClick}
-          sx={{
-            outline: 'true',
-            fontSize: '0.6rem',
-            padding: 0
-          }}
-        >
-          Skip to main content
-        </Button>
-      </Tooltip>
+      <Button
+        aria-label="Skip to main content"
+        variant="text"
+        tabIndex={0}
+        onClick={handleClick}
+        sx={{
+          outline: 'true',
+          fontSize: '0.6rem',
+          padding: 0
+        }}
+      >
+        Skip to main content
+      </Button>
     </Box>
   );
 };
diff --git a/frontend/src/components/Table/Table.tsx b/frontend/src/components/Table/Table.tsx
index b76fd404..584bf89a 100644
--- a/frontend/src/components/Table/Table.tsx
+++ b/frontend/src/components/Table/Table.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useImperativeHandle } from 'react';
 import { Table as UsaTable } from '@trussworks/react-uswds';
-import { Query } from 'types';
+import { OrgQuery } from 'types/org-query';
 import {
   useTable,
   useExpanded,
@@ -25,7 +25,7 @@ interface TableProps<T extends object> {
   initialFilterBy?: Filters<T>;
   pageCount?: number;
   pageSize?: number;
-  fetchData?: (query: Query<T>) => void;
+  fetchData?: (query: OrgQuery<T>) => void;
   disableFilters?: boolean;
   renderPagination?: (table: TableInstance<T>) => JSX.Element;
   renderExpanded?: (row: Row<T>) => JSX.Element;
diff --git a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap
index 8527c31f..e8920f77 100644
--- a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap
+++ b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap
@@ -3,125 +3,140 @@
 exports[`Header component matches snapshot 1`] = `
 <DocumentFragment>
   <div
-    class="css-r5wyex"
+    class="css-0"
   >
     <header
       class="MuiPaper-root MuiPaper-elevation MuiPaper-elevation0 MuiAppBar-root MuiAppBar-colorPrimary MuiAppBar-positionStatic css-1twrj82-MuiPaper-root-MuiAppBar-root"
     >
       <div
-        class="Header-inner"
+        class="MuiBox-root css-1udqnvq"
       >
         <div
-          class="MuiToolbar-root MuiToolbar-gutters MuiToolbar-regular css-hyum1k-MuiToolbar-root"
+          class="MuiToolbar-root MuiToolbar-gutters MuiToolbar-regular css-gihjh0-MuiToolbar-root"
         >
-          <button
-            aria-label="Open filter drawer"
-            class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
-            tabindex="0"
-            type="button"
+          <div
+            class="MuiBox-root css-maj3td"
           >
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
-              data-testid="FilterAltIcon"
-              focusable="false"
-              style="color: white;"
-              viewBox="0 0 24 24"
+            <button
+              aria-label="Open filter drawer"
+              class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeMedium css-78trlr-MuiButtonBase-root-MuiIconButton-root"
+              tabindex="0"
+              type="button"
             >
-              <path
-                d="M4.25 5.61C6.27 8.2 10 13 10 13v6c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-6s3.72-4.8 5.74-7.39c.51-.66.04-1.61-.79-1.61H5.04c-.83 0-1.3.95-.79 1.61z"
+              <svg
+                aria-hidden="true"
+                class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                data-testid="FilterAltIcon"
+                focusable="false"
+                style="color: white;"
+                viewBox="0 0 24 24"
+              >
+                <path
+                  d="M4.25 5.61C6.27 8.2 10 13 10 13v6c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-6s3.72-4.8 5.74-7.39c.51-.66.04-1.61-.79-1.61H5.04c-.83 0-1.3.95-.79 1.61z"
+                />
+              </svg>
+              <span
+                class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
               />
-            </svg>
-            <span
-              class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
-            />
-          </button>
-          <img
-            alt="Cybersecurity and Infrastructure Security Agency Logo"
-            class="Header-1cisaLogo"
-            src="cisaSeal.svg"
-          />
-          <a
-            href="/"
-          >
+            </button>
             <img
-              alt="CyHy Dashboard Icon Navigate Home"
-              class="Header-logo"
-              src="cyhydashboard.svg"
+              alt="Cybersecurity and Infrastructure Security Agency Logo"
+              src="cisaSeal.svg"
+              style="height: 40px; margin-right: 8px;"
             />
-          </a>
-          <div
-            class="Header-lgNav"
-          >
-            <div
-              class="css-1ssxti9"
+            <a
+              href="/"
+              style="height: 30px;"
             >
-              <a
-                aria-current="page"
-                class="NavItem-link NavItem-activeLink"
-                href="/"
-              >
-                Overview
-              </a>
-            </div>
+              <img
+                alt="CyHy Dashboard Icon Navigate Home"
+                src="cyhydashboard.svg"
+                style="width: 175px; max-width: 175px; padding: 8px 8px 8px 0px;"
+              />
+            </a>
             <div
-              class="css-1ssxti9"
+              class="MuiBox-root css-1cj6uv1"
             >
-              <a
-                class="NavItem-link"
-                href="/inventory"
+              <div
+                class="css-1ssxti9"
+              >
+                <a
+                  aria-current="page"
+                  class="NavItem-link NavItem-activeLink"
+                  href="/"
+                >
+                  Overview
+                </a>
+              </div>
+              <div
+                class="css-1ssxti9"
               >
-                Inventory
-              </a>
+                <a
+                  class="NavItem-link"
+                  href="/inventory"
+                >
+                  Inventory
+                </a>
+              </div>
             </div>
           </div>
           <div
-            class="Header-spacing"
-          />
+            class="MuiBox-root css-1xvlbjo"
+          >
+            <p
+              class="MuiTypography-root MuiTypography-body1 css-ahj2mt-MuiTypography-root"
+            >
+              Standard User
+            </p>
+          </div>
           <div
-            class="MuiBox-root css-d0uhtl"
+            class="MuiBox-root css-pp441y"
           >
-            <button
-              class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-2oatfu-MuiButtonBase-root-MuiButton-root"
-              style="color: white;"
-              tabindex="0"
-              type="button"
+            <div
+              class="MuiBox-root css-d0uhtl"
             >
-              <span
-                class="MuiButton-startIcon MuiButton-iconSizeMedium css-1d6wzja-MuiButton-startIcon"
+              <button
+                class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-2oatfu-MuiButtonBase-root-MuiButton-root"
+                style="color: white;"
+                tabindex="0"
+                type="button"
               >
-                <svg
-                  aria-hidden="true"
-                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
-                  data-testid="AccountCircleIcon"
-                  focusable="false"
-                  viewBox="0 0 24 24"
+                <span
+                  class="MuiButton-startIcon MuiButton-iconSizeMedium css-1d6wzja-MuiButton-startIcon"
                 >
-                  <path
-                    d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 4c1.93 0 3.5 1.57 3.5 3.5S13.93 13 12 13s-3.5-1.57-3.5-3.5S10.07 6 12 6zm0 14c-2.03 0-4.43-.82-6.14-2.88C7.55 15.8 9.68 15 12 15s4.45.8 6.14 2.12C16.43 19.18 14.03 20 12 20z"
-                  />
-                </svg>
-              </span>
-              My Account
-              <span
-                class="MuiButton-endIcon MuiButton-iconSizeMedium css-9tj150-MuiButton-endIcon"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
-                  data-testid="ArrowDropDownIcon"
-                  focusable="false"
-                  viewBox="0 0 24 24"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                    data-testid="AccountCircleIcon"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 4c1.93 0 3.5 1.57 3.5 3.5S13.93 13 12 13s-3.5-1.57-3.5-3.5S10.07 6 12 6zm0 14c-2.03 0-4.43-.82-6.14-2.88C7.55 15.8 9.68 15 12 15s4.45.8 6.14 2.12C16.43 19.18 14.03 20 12 20z"
+                    />
+                  </svg>
+                </span>
+                My Account
+                <span
+                  class="MuiButton-endIcon MuiButton-iconSizeMedium css-9tj150-MuiButton-endIcon"
                 >
-                  <path
-                    d="m7 10 5 5 5-5z"
-                  />
-                </svg>
-              </span>
-              <span
-                class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
-              />
-            </button>
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
+                    data-testid="ArrowDropDownIcon"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="m7 10 5 5 5-5z"
+                    />
+                  </svg>
+                </span>
+                <span
+                  class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
+                />
+              </button>
+            </div>
           </div>
         </div>
       </div>
diff --git a/frontend/src/components/__tests__/__snapshots__/layout.spec.tsx.snap b/frontend/src/components/__tests__/__snapshots__/layout.spec.tsx.snap
index aa6aed47..df2d7765 100644
--- a/frontend/src/components/__tests__/__snapshots__/layout.spec.tsx.snap
+++ b/frontend/src/components/__tests__/__snapshots__/layout.spec.tsx.snap
@@ -20,7 +20,6 @@ exports[`Layout component matches snapshot 1`] = `
           <button
             aria-label="Skip to main content"
             class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-1a47txt-MuiButtonBase-root-MuiButton-root"
-            data-mui-internal-clone-element="true"
             tabindex="0"
             type="button"
           >
@@ -72,6 +71,36 @@ exports[`Layout component matches snapshot 1`] = `
               <hr
                 class="MuiDivider-root MuiDivider-fullWidth css-9mgopn-MuiDivider-root"
               />
+              <div
+                class="MuiBox-root css-19midj6"
+              >
+                <div
+                  class="SearchBar-wrapper css-1ysk2k2"
+                >
+                  <div
+                    class="SearchBar-inner MuiBox-root css-0"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium SearchBar-icon css-i4bv87-MuiSvgIcon-root"
+                      data-testid="SearchOutlinedIcon"
+                      focusable="false"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
+                      />
+                    </svg>
+                    <form>
+                      <input
+                        class="SearchBar-inp"
+                        placeholder="Search by Domain or IP"
+                        value=""
+                      />
+                    </form>
+                  </div>
+                </div>
+              </div>
               <div
                 class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiAccordion-root MuiAccordion-rounded Mui-expanded MuiAccordion-gutters css-1elwnq4-MuiPaper-root-MuiAccordion-root"
               >
@@ -244,6 +273,11 @@ exports[`Layout component matches snapshot 1`] = `
           <div>
             HEADER
           </div>
+          <div
+            class="main-content"
+            id="main-content"
+            tabindex="-1"
+          />
           <div
             class="MuiBox-root css-1ycota"
           />
@@ -257,7 +291,7 @@ exports[`Layout component matches snapshot 1`] = `
                 class="MuiGrid-root MuiGrid-container Footer-footerContainer css-11lq3yg-MuiGrid-root"
               >
                 <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerLogo css-6vomyv-MuiGrid-root"
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerLogo css-2shs9e-MuiGrid-root"
                 >
                   <a
                     class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-smdm7r-MuiTypography-root-MuiLink-root"
@@ -270,7 +304,7 @@ exports[`Layout component matches snapshot 1`] = `
                   </a>
                 </div>
                 <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerNavItem css-6vomyv-MuiGrid-root"
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerNavItem css-2shs9e-MuiGrid-root"
                 >
                   <a
                     class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways Footer-footerNavLink css-smdm7r-MuiTypography-root-MuiLink-root"
@@ -280,7 +314,7 @@ exports[`Layout component matches snapshot 1`] = `
                   </a>
                 </div>
                 <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerNavItem css-6vomyv-MuiGrid-root"
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerNavItem css-2shs9e-MuiGrid-root"
                 >
                   <p>
                     <a
@@ -293,7 +327,7 @@ exports[`Layout component matches snapshot 1`] = `
                   </p>
                 </div>
                 <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerNavItem css-6vomyv-MuiGrid-root"
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerNavItem css-2shs9e-MuiGrid-root"
                 >
                   <p>
                     <a
@@ -305,7 +339,7 @@ exports[`Layout component matches snapshot 1`] = `
                   </p>
                 </div>
                 <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerNavItem css-6vomyv-MuiGrid-root"
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-2 Footer-footerNavItem css-2shs9e-MuiGrid-root"
                 >
                   <p>
                     <a
diff --git a/frontend/src/components/__tests__/__snapshots__/searchBar.spec.tsx.snap b/frontend/src/components/__tests__/__snapshots__/searchBar.spec.tsx.snap
index 001202b4..58d78fc0 100644
--- a/frontend/src/components/__tests__/__snapshots__/searchBar.spec.tsx.snap
+++ b/frontend/src/components/__tests__/__snapshots__/searchBar.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`matches snapshot 1`] = `
       <form>
         <input
           class="SearchBar-inp"
-          placeholder="Search a domain, vuln, port, service, IP"
+          placeholder="Search by Domain or IP"
           value=""
         />
       </form>
diff --git a/frontend/src/context/SavedSearchContext.ts b/frontend/src/context/SavedSearchContext.ts
new file mode 100644
index 00000000..c34b0697
--- /dev/null
+++ b/frontend/src/context/SavedSearchContext.ts
@@ -0,0 +1,20 @@
+import React, { useContext } from 'react';
+import { SavedSearch } from '../types/saved-search';
+
+export interface SavedSearchContextType {
+  savedSearches: SavedSearch[];
+  setSavedSearches: (savedSearches: SavedSearch[]) => void;
+  savedSearchCount: number;
+  setSavedSearchCount: (savedSearchCount: number) => void;
+  activeSearchId: string;
+  setActiveSearchId: (activeSearchId: string) => void;
+  activeSearch: SavedSearch | undefined;
+}
+
+export const SavedSearchContext = React.createContext<SavedSearchContextType>(
+  undefined!
+);
+
+export const useSavedSearchContext = (): SavedSearchContextType => {
+  return useContext(SavedSearchContext);
+};
diff --git a/frontend/src/context/SavedSearchContextProvider.tsx b/frontend/src/context/SavedSearchContextProvider.tsx
new file mode 100644
index 00000000..15f9ae65
--- /dev/null
+++ b/frontend/src/context/SavedSearchContextProvider.tsx
@@ -0,0 +1,58 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { SavedSearchContext } from './SavedSearchContext';
+import { SavedSearch } from '../types/saved-search';
+import { useAuthContext } from './AuthContext';
+
+interface SavedSearchContextProviderProps {
+  children: React.ReactNode;
+}
+
+export const SavedSearchContextProvider: React.FC<
+  SavedSearchContextProviderProps
+> = ({ children }) => {
+  const [savedSearches, setSavedSearches] = useState<SavedSearch[]>([]);
+  const [savedSearchCount, setSavedSearchCount] = useState<number>(0);
+  const [activeSearchId, setActiveSearchId] = useState<string>('');
+  const { apiGet, user } = useAuthContext();
+
+  const fetchSearches = useCallback(async () => {
+    try {
+      const response = await apiGet('/saved-searches');
+      setSavedSearches(response.result);
+      setSavedSearchCount(response.result.length);
+    } catch (e) {
+      console.log(e);
+    }
+  }, [apiGet, setSavedSearches, setSavedSearchCount]);
+
+  const activeSearch = useMemo(() => {
+    return savedSearches.find((search) => search.id === activeSearchId);
+  }, [activeSearchId, savedSearches]);
+
+  useEffect(() => {
+    if (user) fetchSearches();
+  }, [user, fetchSearches]);
+
+  const memoizedSavedSearches = useMemo(() => {
+    return savedSearches;
+  }, [savedSearches]);
+
+  const memoizedSavedSearchCount = useMemo(() => {
+    return savedSearchCount;
+  }, [savedSearchCount]);
+  return (
+    <SavedSearchContext.Provider
+      value={{
+        savedSearches: memoizedSavedSearches,
+        setSavedSearches,
+        savedSearchCount: memoizedSavedSearchCount,
+        setSavedSearchCount,
+        activeSearchId,
+        setActiveSearchId,
+        activeSearch
+      }}
+    >
+      {children}
+    </SavedSearchContext.Provider>
+  );
+};
diff --git a/frontend/src/context/SearchProvider/types.ts b/frontend/src/context/SearchProvider/types.ts
index f22d0a72..d568e9c9 100644
--- a/frontend/src/context/SearchProvider/types.ts
+++ b/frontend/src/context/SearchProvider/types.ts
@@ -1,14 +1,10 @@
 export interface ContextType {
-  addFilter(
-    name: string,
-    value: string,
-    filterType: 'all' | 'any' | 'none'
-  ): void;
+  addFilter(name: string, value: any, filterType: 'all' | 'any' | 'none'): void;
   clearFilters: any;
   saveSearch: any;
   removeFilter(
     name: string,
-    value: string,
+    value: any,
     filterType: 'all' | 'any' | 'none'
   ): void;
   setSearchTerm(s: string, opts?: any): void;
diff --git a/frontend/src/context/StaticsContextProvider.tsx b/frontend/src/context/StaticsContextProvider.tsx
index 74fe4c4e..5f6201c6 100644
--- a/frontend/src/context/StaticsContextProvider.tsx
+++ b/frontend/src/context/StaticsContextProvider.tsx
@@ -23,7 +23,12 @@ export const StaticsContextProvider: React.FC<StaticsContextProviderProps> = ({
       setRegions(
         results
           .map((region: { regionId: string }) => region.regionId)
-          .sort((a: string, b: string) => a.localeCompare(b))
+          .sort((a: string, b: string) => {
+            if (parseInt(a) < parseInt(b)) {
+              return -1;
+            }
+            return 1;
+          })
       );
     } catch (e) {
       console.log(e);
diff --git a/frontend/src/context/Theme.tsx b/frontend/src/context/Theme.tsx
index d3790754..a9003abf 100644
--- a/frontend/src/context/Theme.tsx
+++ b/frontend/src/context/Theme.tsx
@@ -13,6 +13,20 @@ declare module '@mui/material/styles' {
   interface PaletteOptions {
     disabled?: PaletteOptions['primary'];
   }
+
+  interface BreakpointOverrides {
+    mds: true;
+  }
+  interface BreakpointsOptions {
+    values: {
+      xs: number;
+      sm: number;
+      mds: number;
+      md: number;
+      lg: number;
+      xl: number;
+    };
+  }
 }
 
 const theme = createTheme({
@@ -35,6 +49,7 @@ const theme = createTheme({
     values: {
       xs: 0,
       sm: 600,
+      mds: 750,
       md: 960,
       lg: 1330,
       xl: 1920
diff --git a/frontend/src/context/userStateUtils.ts b/frontend/src/context/userStateUtils.ts
index af24aece..950a0ea3 100644
--- a/frontend/src/context/userStateUtils.ts
+++ b/frontend/src/context/userStateUtils.ts
@@ -1,5 +1,6 @@
 import { Organization, OrganizationTag } from 'types';
 import { AuthUser, CurrentOrganization } from './AuthContext';
+import { ORGANIZATION_EXCLUSIONS } from 'hooks/useUserTypeFilters';
 
 const currentTermsVersion = process.env.REACT_APP_TERMS_VERSION;
 
@@ -9,6 +10,7 @@ export const getExtendedOrg = (
 ) => {
   const current: CurrentOrganization | null =
     org ?? user?.roles[0]?.organization ?? null;
+  if (current && ORGANIZATION_EXCLUSIONS.includes(current?.name)) return null;
   return current;
 };
 
diff --git a/frontend/src/hooks/useDomainApi.ts b/frontend/src/hooks/useDomainApi.ts
index 37fe5880..0b98071e 100644
--- a/frontend/src/hooks/useDomainApi.ts
+++ b/frontend/src/hooks/useDomainApi.ts
@@ -1,6 +1,7 @@
 import { Query, Domain } from 'types';
 import { useAuthContext } from 'context';
 import { useCallback } from 'react';
+import { ORGANIZATION_EXCLUSIONS } from './useUserTypeFilters';
 
 export interface DomainQuery extends Query<Domain> {
   showAll?: boolean;
@@ -18,32 +19,34 @@ export const useDomainApi = (showAll?: boolean) => {
   const { currentOrganization, apiPost, apiGet } = useAuthContext();
   const listDomains = useCallback(
     async (query: DomainQuery, doExport = false) => {
-      const { page, sort, filters, pageSize = PAGE_SIZE } = query;
-
+      const { page, filters, pageSize = PAGE_SIZE } = query;
       const tableFilters: any = filters
         .filter((f) => Boolean(f.value))
         .reduce(
           (accum, next) => ({
             ...accum,
-            [next.id]: next.value
+            [next.field]: next.value
           }),
           {}
         );
-
-      if (!showAll && currentOrganization) {
-        if ('rootDomains' in currentOrganization)
-          tableFilters['organization'] = currentOrganization.id;
-        else tableFilters['tag'] = currentOrganization.id;
+      let userOrgIsExcluded = false;
+      ORGANIZATION_EXCLUSIONS.forEach((exc) => {
+        if (currentOrganization?.name.toLowerCase().includes(exc)) {
+          userOrgIsExcluded = true;
+        }
+      });
+      if (currentOrganization && !userOrgIsExcluded) {
+        tableFilters['organization'] = currentOrganization.id;
       }
 
+      console.log('filters here', tableFilters);
+
       const { result, count, url } = await apiPost<ApiResponse>(
         doExport ? '/domain/export' : '/domain/search',
         {
           body: {
             pageSize,
             page,
-            sort: sort[0]?.id ?? 'name',
-            order: sort[0]?.desc ? 'DESC' : 'ASC',
             filters: tableFilters
           }
         }
@@ -56,7 +59,7 @@ export const useDomainApi = (showAll?: boolean) => {
         pageCount: Math.ceil(count / pageSize)
       };
     },
-    [apiPost, showAll, currentOrganization]
+    [apiPost, currentOrganization]
   );
 
   const getDomain = useCallback(
diff --git a/frontend/src/hooks/useUserLevel.ts b/frontend/src/hooks/useUserLevel.ts
index 19ff8f75..2bcc5426 100644
--- a/frontend/src/hooks/useUserLevel.ts
+++ b/frontend/src/hooks/useUserLevel.ts
@@ -17,27 +17,33 @@ type UserLevel = {
   userLevel: number;
   userType: UserType;
   user: AuthContextType['user'];
+  formattedUserType: string;
 };
 
 export const useUserLevel: () => UserLevel = () => {
   const { user } = useAuthContext();
   let userLevel = 0;
+  let formattedUserType = '';
   const userType: UserType = user?.userType;
   if (user && user.isRegistered) {
     if (user.userType === 'standard') {
       userLevel = STANDARD_USER;
+      formattedUserType = 'Standard User';
     } else if (user.userType === 'globalAdmin') {
       userLevel = GLOBAL_ADMIN;
-    } else if (
-      user.userType === 'regionalAdmin' ||
-      user.userType === 'globalView'
-    ) {
+      formattedUserType = 'Global Admin';
+    } else if (user.userType === 'regionalAdmin') {
       userLevel = REGIONAL_ADMIN;
+      formattedUserType = 'Regional Admin';
+    } else if (user.userType === 'globalView') {
+      userLevel = REGIONAL_ADMIN;
+      formattedUserType = 'Global View';
     }
   }
   return {
     userLevel,
     userType,
-    user
+    user,
+    formattedUserType
   };
 };
diff --git a/frontend/src/hooks/useUserTypeFilters.ts b/frontend/src/hooks/useUserTypeFilters.ts
index dbb2fdfd..b91d7364 100644
--- a/frontend/src/hooks/useUserTypeFilters.ts
+++ b/frontend/src/hooks/useUserTypeFilters.ts
@@ -1,10 +1,12 @@
 import { AuthContextType } from 'context';
 import { GLOBAL_ADMIN, REGIONAL_ADMIN, STANDARD_USER } from './useUserLevel';
 import { GLOBAL_VIEW } from 'context/userStateUtils';
-import { OrganizationShallow } from 'components/OrganizationSearch';
+import { OrganizationShallow } from 'components/RegionAndOrganizationFilters';
 
 export const REGIONAL_USER_CAN_SEARCH_OTHER_REGIONS = false;
 
+export const ORGANIZATION_EXCLUSIONS = ['dhs region'];
+
 interface Filter {
   field: string;
   values: Array<any>;
@@ -26,14 +28,24 @@ export const useUserTypeFilters: UseUserTypeFilters = (
 
   const userOrgs: OrganizationShallow[] =
     userRoles.length > 0
-      ? userRoles.map((role) => {
-          return {
-            name: role?.organization?.name ?? '',
-            id: role?.organization?.id ?? '',
-            regionId: role?.organization?.regionId ?? '',
-            rootDomains: role?.organization?.rootDomains ?? []
-          };
-        })
+      ? userRoles
+          .filter((role) => {
+            let exclude = false;
+            ORGANIZATION_EXCLUSIONS.forEach((item) => {
+              if (role.organization.name.toLowerCase().includes(item)) {
+                exclude = true;
+              }
+            });
+            return !exclude;
+          })
+          .map((role) => {
+            return {
+              name: role?.organization?.name ?? '',
+              id: role?.organization?.id ?? '',
+              regionId: role?.organization?.regionId ?? '',
+              rootDomains: role?.organization?.rootDomains ?? []
+            };
+          })
       : [];
 
   const userRegions = user?.regionId ? [user?.regionId] : [];
diff --git a/frontend/src/pages/AdminTools/AdminTools.tsx b/frontend/src/pages/AdminTools/AdminTools.tsx
index e40cfc3a..4e068099 100644
--- a/frontend/src/pages/AdminTools/AdminTools.tsx
+++ b/frontend/src/pages/AdminTools/AdminTools.tsx
@@ -5,6 +5,7 @@ import ScansView from 'pages/Scans/ScansView';
 import ScanTasksView from 'pages/Scans/ScanTasksView';
 import { Box, Container, Tab } from '@mui/material';
 import { TabContext, TabList, TabPanel } from '@mui/lab';
+import { Logs } from 'components/Logs/Logs';
 
 export const AdminTools: React.FC = () => {
   const [value, setValue] = React.useState('1');
@@ -21,6 +22,7 @@ export const AdminTools: React.FC = () => {
               <Tab label="Scans" value="1" />
               <Tab label="Scan History" value="2" />
               <Tab label="Notifications" value="3" />
+              <Tab label="User Logs" value="4" />
             </TabList>
           </Box>
           <TabPanel value="1">
@@ -33,6 +35,9 @@ export const AdminTools: React.FC = () => {
           <TabPanel value="3">
             <Notifications />
           </TabPanel>
+          <TabPanel value="4">
+            <Logs />
+          </TabPanel>
         </TabContext>
       </Box>
     </Container>
diff --git a/frontend/src/pages/Domains/Domains.tsx b/frontend/src/pages/Domains/Domains.tsx
index 3cf7b39e..e6bacd33 100644
--- a/frontend/src/pages/Domains/Domains.tsx
+++ b/frontend/src/pages/Domains/Domains.tsx
@@ -35,7 +35,16 @@ export const Domains: React.FC = () => {
   const [filters, setFilters] = useState<Query<Domain>['filters']>([]);
   const [loadingError, setLoadingError] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
-
+  const [filterModel, setFilterModel] = useState({
+    items: filters.map((filter) => ({
+      id: filter.id,
+      field: filter.field,
+      value: filter.value,
+      operator: filter.operator
+    }))
+  });
+  // TO-DO
+  // Implement regional rollup on domains view to allow for proper domain drilldown from dashboard
   const fetchDomains = useCallback(
     async (q: Query<Domain>) => {
       try {
@@ -64,7 +73,6 @@ export const Domains: React.FC = () => {
     page: 0,
     pageSize: PAGE_SIZE,
     pageCount: 0,
-    sort: [],
     filters: filters
   });
 
@@ -73,7 +81,6 @@ export const Domains: React.FC = () => {
     fetchDomains({
       page: 1,
       pageSize: PAGE_SIZE,
-      sort: [],
       filters: []
     });
   }, [fetchDomains]);
@@ -182,21 +189,26 @@ export const Domains: React.FC = () => {
                 fetchDomains({
                   page: model.page + 1,
                   pageSize: model.pageSize,
-                  sort: paginationModel.sort,
                   filters: paginationModel.filters
                 });
               }}
               filterMode="server"
+              filterModel={filterModel}
               onFilterModelChange={(model) => {
                 const filters = model.items.map((item) => ({
                   id: item.field,
-                  value: item.value
+                  field: item.field,
+                  value: item.value,
+                  operator: item.operator
                 }));
                 setFilters(filters);
+                setFilterModel((prevFilterModel) => ({
+                  ...prevFilterModel,
+                  items: filters
+                }));
                 fetchDomains({
                   page: paginationModel.page + 1,
                   pageSize: paginationModel.pageSize,
-                  sort: paginationModel.sort,
                   filters: filters
                 });
               }}
diff --git a/frontend/src/pages/Organization/OrgScanHistory.tsx b/frontend/src/pages/Organization/OrgScanHistory.tsx
new file mode 100644
index 00000000..207e9e21
--- /dev/null
+++ b/frontend/src/pages/Organization/OrgScanHistory.tsx
@@ -0,0 +1,200 @@
+import React, { useState, useCallback } from 'react';
+import { useAuthContext } from 'context';
+import {
+  Organization as OrganizationType,
+  ScanTask,
+  Scan,
+  ScanSchema
+} from 'types';
+import { Button } from '@mui/material';
+import { Column } from 'react-table';
+import { Table } from 'components';
+// @ts-ignore:next-line
+import { formatDistanceToNow, parseISO } from 'date-fns';
+
+interface OrganizationScan extends Partial<OrganizationType> {
+  id: any;
+  granularScans: any;
+}
+
+type OrgScanHistoryProps = {
+  organization: OrganizationScan;
+  setOrganization: Function;
+  scanTasks: ScanTask[];
+};
+
+export const OrgScanHistory: React.FC<OrgScanHistoryProps> = ({
+  organization,
+  setOrganization,
+  scanTasks
+}) => {
+  const { apiGet, apiPost, user, setFeedbackMessage } = useAuthContext();
+  const [scans, setScans] = useState<Scan[]>([]);
+  const [scanSchema, setScanSchema] = useState<ScanSchema>({});
+
+  const dateAccessor = (date?: string) => {
+    return !date || new Date(date).getTime() === new Date(0).getTime()
+      ? 'None'
+      : `${formatDistanceToNow(parseISO(date))} ago`;
+  };
+
+  const fetchScans = useCallback(async () => {
+    try {
+      const response = await apiGet<{
+        scans: Scan[];
+        schema: ScanSchema;
+      }>('/granularScans/');
+      let { scans } = response;
+      const { schema } = response;
+
+      if (user?.userType !== 'globalAdmin')
+        scans = scans.filter(
+          (scan) =>
+            scan.name !== 'censysIpv4' && scan.name !== 'censysCertificates'
+        );
+
+      setScans(scans);
+      setScanSchema(schema);
+    } catch (e) {
+      console.error(e);
+    }
+  }, [apiGet, user]);
+
+  const updateScan = async (scan: Scan, enabled: boolean) => {
+    try {
+      if (!organization) return;
+      await apiPost(
+        `/organizations/${organization?.id}/granularScans/${scan.id}/update`,
+        {
+          body: {
+            enabled
+          }
+        }
+      );
+      setOrganization({
+        ...organization,
+        granularScans: enabled
+          ? organization.granularScans.concat([scan])
+          : organization.granularScans.filter(
+              (granularScan: { id: string }) => granularScan.id !== scan.id
+            )
+      });
+    } catch (e: any) {
+      setFeedbackMessage({
+        message:
+          e.status === 422 ? 'Error updating scan' : e.message ?? e.toString(),
+        type: 'error'
+      });
+      console.error(e);
+    }
+  };
+  const scanColumns: Column<Scan>[] = [
+    {
+      Header: 'Name',
+      accessor: 'name',
+      width: 150,
+      id: 'name',
+      disableFilters: true
+    },
+    {
+      Header: 'Description',
+      accessor: ({ name }) => scanSchema[name] && scanSchema[name].description,
+      width: 200,
+      minWidth: 200,
+      id: 'description',
+      disableFilters: true
+    },
+    {
+      Header: 'Mode',
+      accessor: ({ name }) =>
+        scanSchema[name] && scanSchema[name].isPassive ? 'Passive' : 'Active',
+      width: 150,
+      minWidth: 150,
+      id: 'mode',
+      disableFilters: true
+    },
+    {
+      Header: 'Action',
+      id: 'action',
+      maxWidth: 100,
+      Cell: ({ row }: { row: { index: number } }) => {
+        if (!organization) return null;
+        const enabled = organization.granularScans.find(
+          (scan: { id: string }) => scan.id === scans[row.index].id
+        );
+        return (
+          <Button
+            type="button"
+            onClick={() => {
+              updateScan(scans[row.index], !enabled);
+            }}
+          >
+            {enabled ? 'Disable' : 'Enable'}
+          </Button>
+        );
+      },
+      disableFilters: true
+    }
+  ];
+
+  const scanTaskColumns: Column<ScanTask>[] = [
+    {
+      Header: 'ID',
+      accessor: 'id',
+      disableFilters: true
+    },
+    {
+      Header: 'Status',
+      accessor: 'status',
+      disableFilters: true
+    },
+    {
+      Header: 'Type',
+      accessor: 'type',
+      disableFilters: true
+    },
+    {
+      Header: 'Name',
+      accessor: ({ scan }) => scan?.name,
+      disableFilters: true
+    },
+    {
+      Header: 'Created At',
+      accessor: ({ createdAt }) => dateAccessor(createdAt),
+      disableFilters: true,
+      disableSortBy: true
+    },
+    {
+      Header: 'Requested At',
+      accessor: ({ requestedAt }) => dateAccessor(requestedAt),
+      disableFilters: true,
+      disableSortBy: true
+    },
+    {
+      Header: 'Started At',
+      accessor: ({ startedAt }) => dateAccessor(startedAt),
+      disableFilters: true,
+      disableSortBy: true
+    },
+    {
+      Header: 'Finished At',
+      accessor: ({ finishedAt }) => dateAccessor(finishedAt),
+      disableFilters: true,
+      disableSortBy: true
+    },
+    {
+      Header: 'Output',
+      accessor: 'output',
+      disableFilters: true
+    }
+  ];
+  return (
+    <>
+      <Table<Scan> columns={scanColumns} data={scans} fetchData={fetchScans} />
+      <h2>Organization Scan History</h2>
+      <Table<ScanTask> columns={scanTaskColumns} data={scanTasks} />
+    </>
+  );
+};
+
+export default OrgScanHistory;
diff --git a/frontend/src/pages/Organization/OrgSettings.tsx b/frontend/src/pages/Organization/OrgSettings.tsx
new file mode 100644
index 00000000..26473b8f
--- /dev/null
+++ b/frontend/src/pages/Organization/OrgSettings.tsx
@@ -0,0 +1,488 @@
+import React from 'react';
+import { useAuthContext } from 'context';
+import {
+  PendingDomain,
+  Organization as OrganizationType,
+  OrganizationTag
+} from 'types';
+import {
+  Alert,
+  Autocomplete,
+  Button,
+  Chip,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  Grid,
+  Stack,
+  Switch,
+  TextField,
+  Typography
+} from '@mui/material';
+import { CheckCircleOutline, Place, Public } from '@mui/icons-material';
+import InfoDialog from 'components/Dialog/InfoDialog';
+
+interface AutocompleteType extends Partial<OrganizationTag> {
+  title?: string;
+}
+
+interface OrgSettingsType extends Partial<OrganizationType> {
+  id: any;
+  granularScans: any;
+  rootDomains: string[];
+  ipBlocks: string[];
+  tags: OrganizationTag[];
+  pendingDomains: PendingDomain[];
+}
+
+type OrgSettingsProps = {
+  organization: OrgSettingsType;
+  setOrganization: Function;
+  tags: AutocompleteType[];
+};
+
+export const OrgSettings: React.FC<OrgSettingsProps> = ({
+  organization,
+  setOrganization,
+  tags
+}) => {
+  const { apiPut, apiPost, user, setFeedbackMessage } = useAuthContext();
+  const [inputValue, setInputValue] = React.useState('');
+  const [dialog, setDialog] = React.useState<{
+    open: boolean;
+    type?: 'rootDomains' | 'ipBlocks' | 'tags';
+    label?: string;
+    stage?: number;
+    domainVerificationStatusMessage?: string;
+  }>({ open: false });
+  const [isSaveDisabled, setIsSaveDisabled] = React.useState(true);
+  const [infoDialogOpen, setInfoDialogOpen] = React.useState(false);
+  const [chosenTags, setChosenTags] = React.useState<string[]>(
+    organization.tags ? organization.tags.map((tag) => tag.name) : []
+  );
+
+  const updateOrganization = async (body: any) => {
+    try {
+      const org = await apiPut('/organizations/' + organization?.id, {
+        body: organization
+      });
+      setOrganization(org);
+      setFeedbackMessage({
+        message: 'Organization successfully updated',
+        type: 'success'
+      });
+      setInfoDialogOpen(true);
+    } catch (e: any) {
+      setFeedbackMessage({
+        message:
+          e.status === 422
+            ? 'Error updating organization'
+            : e.message ?? e.toString(),
+        type: 'error'
+      });
+      console.error(e);
+    }
+  };
+
+  const initiateDomainVerification = async (domain: string) => {
+    try {
+      if (!organization) return;
+      const pendingDomains: PendingDomain[] = await apiPost(
+        `/organizations/${organization?.id}/initiateDomainVerification`,
+        {
+          body: { domain }
+        }
+      );
+      setOrganization({ ...organization, pendingDomains });
+    } catch (e: any) {
+      setFeedbackMessage({
+        message:
+          e.status === 422
+            ? 'Error creating domain'
+            : e.message ?? e.toString(),
+        type: 'error'
+      });
+      console.error(e);
+    }
+  };
+
+  const checkDomainVerification = async (domain: string) => {
+    try {
+      if (!organization) return;
+      const resp: { success: boolean; organization?: OrganizationType } =
+        await apiPost(
+          `/organizations/${organization?.id}/checkDomainVerification`,
+          {
+            body: { domain }
+          }
+        );
+      if (resp.success && resp.organization) {
+        setOrganization(resp.organization);
+        setDialog({ open: false });
+        setFeedbackMessage({
+          message: 'Domain ' + inputValue + ' successfully verified!',
+          type: 'success'
+        });
+      } else {
+        setDialog({
+          ...dialog,
+          domainVerificationStatusMessage:
+            'Record not yet found. Note that DNS records may take up to 72 hours to propagate. You can come back later to check the verification status.'
+        });
+      }
+    } catch (e: any) {
+      setFeedbackMessage({
+        message:
+          e.status === 422
+            ? 'Error verifying domain'
+            : e.message ?? e.toString(),
+        type: 'error'
+      });
+      console.error(e);
+    }
+  };
+
+  const handleTagChange = (event: any, newValue: any) => {
+    setChosenTags(newValue);
+    setOrganization((prevValues: any) => ({
+      ...prevValues,
+      tags: newValue.map((tag: any) => ({ name: tag }))
+    }));
+    setIsSaveDisabled(false);
+  };
+
+  const ListInput = (props: {
+    type: 'rootDomains' | 'ipBlocks' | 'tags';
+    label: string;
+  }) => {
+    if (!organization) return null;
+    const elements: (string | OrganizationTag)[] = organization[props.type];
+    return (
+      <Grid container spacing={1}>
+        <Grid item xs={12} sm={3} lg={2} my={1}>
+          <Typography variant="body2">{props.label}</Typography>
+        </Grid>
+        {elements &&
+          elements.map((value: string | OrganizationTag, index: number) => (
+            <Grid item mb={1} key={index}>
+              <Chip
+                color={'primary'}
+                label={typeof value === 'string' ? value : value.name}
+                onDelete={() => {
+                  organization[props.type].splice(index, 1);
+                  setOrganization({ ...organization });
+                  if (chosenTags.length > 0) {
+                    chosenTags.splice(index, 1);
+                    setChosenTags(chosenTags);
+                  }
+                  setIsSaveDisabled(false);
+                }}
+              ></Chip>
+            </Grid>
+          ))}
+        {props.type === 'rootDomains' &&
+          organization.pendingDomains.map((domain, index: number) => (
+            <Grid item mb={1} key={index}>
+              <Chip
+                sx={{ backgroundColor: '#C4C4C4' }}
+                label={domain.name + ' (verification pending)'}
+                onDelete={() => {
+                  organization.pendingDomains.splice(index, 1);
+                  setOrganization({ ...organization });
+                }}
+                onClick={() => {
+                  setInputValue(domain.name);
+                  setDialog({
+                    open: true,
+                    type: props.type,
+                    label: props.label,
+                    stage: 1
+                  });
+                }}
+              ></Chip>
+            </Grid>
+          ))}
+        {(props.type === 'rootDomains' || user?.userType === 'globalAdmin') && (
+          <Grid item mb={1}>
+            <Chip
+              label="ADD"
+              variant="outlined"
+              color="secondary"
+              onClick={() => {
+                setDialog({
+                  open: true,
+                  type: props.type,
+                  label: props.label,
+                  stage: 0
+                });
+              }}
+            />
+          </Grid>
+        )}
+      </Grid>
+    );
+  };
+
+  if (!organization) return null;
+  return (
+    <>
+      <Dialog
+        open={dialog.open}
+        onClose={() => setDialog({ open: false })}
+        aria-labelledby="form-dialog-title"
+        maxWidth="xs"
+        fullWidth
+      >
+        <DialogTitle id="form-dialog-title">
+          {dialog.type === 'tags' ? 'Update ' : 'Add '}
+          {dialog.label && dialog.label.slice(0, -1)}(s)
+        </DialogTitle>
+        <DialogContent>
+          {dialog.type === 'tags' ? (
+            <>
+              <DialogContentText>
+                Use the dropdown to select or deselect existing tags.
+                <br />
+                -- OR --
+                <br />
+                Type and then press enter to add a new tag.
+              </DialogContentText>
+              <Autocomplete
+                value={chosenTags}
+                onChange={handleTagChange}
+                renderTags={(value: readonly string[], getTagProps) =>
+                  value.map((option: string, index: number) => {
+                    const { key, ...tagProps } = getTagProps({ index });
+                    return (
+                      <Chip
+                        variant="outlined"
+                        label={option}
+                        key={key}
+                        {...tagProps}
+                      />
+                    );
+                  })
+                }
+                sx={{ mt: 1 }}
+                multiple
+                options={tags
+                  .map((option) => option.name)
+                  .filter((name): name is string => name !== undefined)}
+                freeSolo
+                renderInput={(params) => (
+                  <TextField {...params} placeholder="Select or add tags" />
+                )}
+              />
+            </>
+          ) : dialog.type === 'rootDomains' && dialog.stage === 1 ? (
+            <>
+              <DialogContentText>
+                Add the following TXT record to {inputValue}&apos;s DNS
+                configuration and click Verify.
+              </DialogContentText>
+              <TextField
+                sx={{ width: '100%' }}
+                value={
+                  organization.pendingDomains.find(
+                    (domain) => domain.name === inputValue
+                  )?.token
+                }
+                onFocus={(event) => {
+                  event.target.select();
+                }}
+              />
+              {dialog.domainVerificationStatusMessage && (
+                <>
+                  <br></br>
+                  <br></br>
+                  <DialogContentText>
+                    {dialog.domainVerificationStatusMessage}
+                  </DialogContentText>
+                </>
+              )}
+            </>
+          ) : user?.userType === 'globalAdmin' ? (
+            <>
+              <DialogContentText>
+                Separate multiple entries by commas.
+              </DialogContentText>
+              <TextField
+                autoFocus
+                margin="dense"
+                id="name"
+                inputProps={{ maxLength: 255 }}
+                placeholder={
+                  dialog.label && 'Enter ' + dialog.label.slice(0, -1) + '(s)'
+                }
+                type="text"
+                fullWidth
+                onChange={(e) => setInputValue(e.target.value)}
+              />
+            </>
+          ) : dialog.type === 'rootDomains' && dialog.stage === 0 ? (
+            <>
+              <DialogContentText>
+                In order to add a root domain, you will need to verify ownership
+                of the domain.
+              </DialogContentText>
+              <TextField
+                autoFocus
+                margin="dense"
+                id="name"
+                label={dialog.label && dialog.label.slice(0, -1)}
+                type="text"
+                fullWidth
+                onChange={(e) => setInputValue(e.target.value)}
+              />
+            </>
+          ) : (
+            <></>
+          )}
+        </DialogContent>
+        <DialogActions>
+          <Button variant="outlined" onClick={() => setDialog({ open: false })}>
+            Cancel
+          </Button>
+          <Button
+            variant="contained"
+            color="primary"
+            onClick={() => {
+              if (
+                dialog.type === 'rootDomains' &&
+                user?.userType !== 'globalAdmin'
+              ) {
+                if (dialog.stage === 0) {
+                  // Start verification process
+                  initiateDomainVerification(inputValue);
+                  setDialog({ ...dialog, stage: 1 });
+                  return;
+                } else {
+                  checkDomainVerification(inputValue);
+                  return;
+                }
+              } else if (dialog.type && dialog.type !== 'tags') {
+                if (inputValue) {
+                  // Allow adding multiple values with a comma delimiter
+                  organization[dialog.type].push(
+                    ...inputValue.split(',').map((e) => e.trim())
+                  );
+                  setOrganization({ ...organization });
+                  if (organization.rootDomains.length !== 0) {
+                    setIsSaveDisabled(false);
+                  }
+                }
+              }
+              setDialog({ open: false });
+              setInputValue('');
+            }}
+          >
+            {dialog.type === 'tags' ? 'Update' : 'Add'}
+          </Button>
+        </DialogActions>
+      </Dialog>
+      <InfoDialog
+        isOpen={infoDialogOpen}
+        handleClick={() => {
+          setInfoDialogOpen(false);
+          setIsSaveDisabled(true);
+        }}
+        icon={<CheckCircleOutline color="success" sx={{ fontSize: '80px' }} />}
+        title={<Typography variant="h4">Success </Typography>}
+        content={
+          <Typography variant="body1">
+            {organization.name} was successfully updated.
+          </Typography>
+        }
+      />
+      <Grid container spacing={1} p={3}>
+        <Grid item xs={12}>
+          <TextField
+            fullWidth
+            value={organization.name}
+            disabled
+            variant="standard"
+            InputProps={{
+              sx: { fontSize: '18px', fontWeight: 400 }
+            }}
+          ></TextField>
+        </Grid>
+        <Grid item xs={12} mt={2} mb={1}>
+          <Stack direction="row" alignItems="center" spacing={1}>
+            {organization.regionId && (
+              <>
+                <Public sx={{ color: 'gray' }} />
+                <Typography variant="body1" color="gray">
+                  Region {organization.regionId}
+                </Typography>
+              </>
+            )}
+            {(organization.stateName || organization.state) && (
+              <>
+                <Place sx={{ color: 'gray' }} />
+                <Typography variant="body1" color="gray">
+                  {organization.stateName || organization.state}
+                </Typography>
+              </>
+            )}
+          </Stack>
+        </Grid>
+        <Grid item xs={12}>
+          <ListInput label="Root Domains" type="rootDomains"></ListInput>
+        </Grid>
+        <Grid item xs={12}>
+          <ListInput label="IP Blocks" type="ipBlocks"></ListInput>
+        </Grid>
+        {user?.userType === 'globalAdmin' && (
+          <Grid item xs={12}>
+            <ListInput label="Tags" type="tags"></ListInput>
+          </Grid>
+        )}
+        <Grid item xs={12}>
+          <Grid container spacing={1}>
+            <Grid item xs={12} sm={3} lg={2} my={1}>
+              <Typography variant="body2">Passive Mode</Typography>
+            </Grid>
+            <Grid item ml={-1}>
+              <Switch
+                checked={organization.isPassive}
+                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                  setOrganization({
+                    ...organization,
+                    isPassive: event.target.checked
+                  });
+                  if (!organization.isPassive) {
+                    setIsSaveDisabled(false);
+                  }
+                }}
+                color="primary"
+              />
+            </Grid>
+          </Grid>
+        </Grid>
+        {organization.rootDomains.length === 0 && (
+          <Grid item xs={12}>
+            <Alert severity="error">
+              An organization must have at least one Root Domain.
+            </Alert>
+          </Grid>
+        )}
+        <Grid item xs={12} mt={2}>
+          <Button variant="outlined" sx={{ mr: 1 }} href="/organizations">
+            Cancel
+          </Button>
+          <Button
+            variant="contained"
+            onClick={updateOrganization}
+            disabled={organization.rootDomains.length === 0 || isSaveDisabled}
+          >
+            Save
+          </Button>
+        </Grid>
+      </Grid>
+    </>
+  );
+};
+
+export default OrgSettings;
diff --git a/frontend/src/pages/Organization/Organization.tsx b/frontend/src/pages/Organization/Organization.tsx
index f044a992..3e9c58ea 100644
--- a/frontend/src/pages/Organization/Organization.tsx
+++ b/frontend/src/pages/Organization/Organization.tsx
@@ -1,180 +1,42 @@
 import React, { useEffect, useState, useCallback } from 'react';
-import * as OrganizationStyles from './style';
-import { Link, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { useAuthContext } from 'context';
 import {
   Organization as OrganizationType,
   Role,
   ScanTask,
-  Scan,
-  ScanSchema,
-  OrganizationTag,
-  PendingDomain
+  OrganizationTag
 } from 'types';
-import { Column } from 'react-table';
-import { Table } from 'components';
-// @ts-ignore:next-line
-import { formatDistanceToNow, parseISO } from 'date-fns';
+
 import {
   Box,
   Breadcrumbs,
-  Chip,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
   Grid,
   Link as MuiLink,
   Paper,
-  Switch as SwitchInput,
   Tab,
-  TextField,
   Typography
 } from '@mui/material';
 import { TabContext, TabList, TabPanel } from '@mui/lab';
 import { ChevronRight } from '@mui/icons-material';
-import { Autocomplete } from '@mui/material';
-import { createFilterOptions } from '@mui/material/useAutocomplete';
-import { OrganizationList } from 'components/OrganizationList';
 import OrgMembers from './OrgMembers';
+import OrgScanHistory from './OrgScanHistory';
+import OrgSettings from './OrgSettings';
 
 interface AutocompleteType extends Partial<OrganizationTag> {
   title?: string;
 }
-
 export const Organization: React.FC = () => {
-  const { apiGet, apiPut, apiPost, user, setFeedbackMessage } =
-    useAuthContext();
+  const { apiGet } = useAuthContext();
   const { organizationId } = useParams<{ organizationId: string }>();
   const [organization, setOrganization] = useState<OrganizationType>();
   const [tags, setTags] = useState<AutocompleteType[]>([]);
   const [userRoles, setUserRoles] = useState<Role[]>([]);
   const [scanTasks, setScanTasks] = useState<ScanTask[]>([]);
-  const [scans, setScans] = useState<Scan[]>([]);
-  const [scanSchema, setScanSchema] = useState<ScanSchema>({});
   const [tabValue, setTabValue] = React.useState('1');
-  const [tagValue, setTagValue] = React.useState<AutocompleteType | null>(null);
-  const [inputValue, setInputValue] = React.useState('');
-  const [dialog, setDialog] = React.useState<{
-    open: boolean;
-    type?: 'rootDomains' | 'ipBlocks' | 'tags';
-    label?: string;
-    stage?: number;
-    domainVerificationStatusMessage?: string;
-  }>({ open: false });
   const handleTabChange = (event: React.SyntheticEvent, newValue: string) => {
     setTabValue(newValue);
   };
-  const dateAccessor = (date?: string) => {
-    return !date || new Date(date).getTime() === new Date(0).getTime()
-      ? 'None'
-      : `${formatDistanceToNow(parseISO(date))} ago`;
-  };
-
-  const organizationClasses = OrganizationStyles.organizationClasses;
-
-  const scanColumns: Column<Scan>[] = [
-    {
-      Header: 'Name',
-      accessor: 'name',
-      width: 150,
-      id: 'name',
-      disableFilters: true
-    },
-    {
-      Header: 'Description',
-      accessor: ({ name }) => scanSchema[name] && scanSchema[name].description,
-      width: 200,
-      minWidth: 200,
-      id: 'description',
-      disableFilters: true
-    },
-    {
-      Header: 'Mode',
-      accessor: ({ name }) =>
-        scanSchema[name] && scanSchema[name].isPassive ? 'Passive' : 'Active',
-      width: 150,
-      minWidth: 150,
-      id: 'mode',
-      disableFilters: true
-    },
-    {
-      Header: 'Action',
-      id: 'action',
-      maxWidth: 100,
-      Cell: ({ row }: { row: { index: number } }) => {
-        if (!organization) return null;
-        const enabled = organization.granularScans.find(
-          (scan) => scan.id === scans[row.index].id
-        );
-        return (
-          <Button
-            type="button"
-            onClick={() => {
-              updateScan(scans[row.index], !enabled);
-            }}
-          >
-            {enabled ? 'Disable' : 'Enable'}
-          </Button>
-        );
-      },
-      disableFilters: true
-    }
-  ];
-
-  const scanTaskColumns: Column<ScanTask>[] = [
-    {
-      Header: 'ID',
-      accessor: 'id',
-      disableFilters: true
-    },
-    {
-      Header: 'Status',
-      accessor: 'status',
-      disableFilters: true
-    },
-    {
-      Header: 'Type',
-      accessor: 'type',
-      disableFilters: true
-    },
-    {
-      Header: 'Name',
-      accessor: ({ scan }) => scan?.name,
-      disableFilters: true
-    },
-    {
-      Header: 'Created At',
-      accessor: ({ createdAt }) => dateAccessor(createdAt),
-      disableFilters: true,
-      disableSortBy: true
-    },
-    {
-      Header: 'Requested At',
-      accessor: ({ requestedAt }) => dateAccessor(requestedAt),
-      disableFilters: true,
-      disableSortBy: true
-    },
-    {
-      Header: 'Started At',
-      accessor: ({ startedAt }) => dateAccessor(startedAt),
-      disableFilters: true,
-      disableSortBy: true
-    },
-    {
-      Header: 'Finished At',
-      accessor: ({ finishedAt }) => dateAccessor(finishedAt),
-      disableFilters: true,
-      disableSortBy: true
-    },
-    {
-      Header: 'Output',
-      accessor: 'output',
-      disableFilters: true
-    }
-  ];
 
   const fetchOrganization = useCallback(async () => {
     try {
@@ -195,453 +57,19 @@ export const Organization: React.FC = () => {
     }
   }, [apiGet, setOrganization, organizationId]);
 
-  const fetchScans = useCallback(async () => {
-    try {
-      const response = await apiGet<{
-        scans: Scan[];
-        schema: ScanSchema;
-      }>('/granularScans/');
-      let { scans } = response;
-      const { schema } = response;
-
-      if (user?.userType !== 'globalAdmin')
-        scans = scans.filter(
-          (scan) =>
-            scan.name !== 'censysIpv4' && scan.name !== 'censysCertificates'
-        );
-
-      setScans(scans);
-      setScanSchema(schema);
-    } catch (e) {
-      console.error(e);
-    }
-  }, [apiGet, user]);
-
-  const updateOrganization = async (body: any) => {
-    try {
-      const org = await apiPut('/organizations/' + organization?.id, {
-        body: organization
-      });
-      setOrganization(org);
-      setFeedbackMessage({
-        message: 'Organization successfully updated',
-        type: 'success'
-      });
-    } catch (e: any) {
-      setFeedbackMessage({
-        message:
-          e.status === 422
-            ? 'Error updating organization'
-            : e.message ?? e.toString(),
-        type: 'error'
-      });
-      console.error(e);
-    }
-  };
-
-  const updateScan = async (scan: Scan, enabled: boolean) => {
-    try {
-      if (!organization) return;
-      await apiPost(
-        `/organizations/${organization?.id}/granularScans/${scan.id}/update`,
-        {
-          body: {
-            enabled
-          }
-        }
-      );
-      setOrganization({
-        ...organization,
-        granularScans: enabled
-          ? organization.granularScans.concat([scan])
-          : organization.granularScans.filter(
-              (granularScan) => granularScan.id !== scan.id
-            )
-      });
-    } catch (e: any) {
-      setFeedbackMessage({
-        message:
-          e.status === 422 ? 'Error updating scan' : e.message ?? e.toString(),
-        type: 'error'
-      });
-      console.error(e);
-    }
-  };
-
-  const initiateDomainVerification = async (domain: string) => {
-    try {
-      if (!organization) return;
-      const pendingDomains: PendingDomain[] = await apiPost(
-        `/organizations/${organization?.id}/initiateDomainVerification`,
-        {
-          body: { domain }
-        }
-      );
-      setOrganization({ ...organization, pendingDomains });
-    } catch (e: any) {
-      setFeedbackMessage({
-        message:
-          e.status === 422
-            ? 'Error creating domain'
-            : e.message ?? e.toString(),
-        type: 'error'
-      });
-      console.error(e);
-    }
-  };
-
-  const checkDomainVerification = async (domain: string) => {
-    try {
-      if (!organization) return;
-      const resp: { success: boolean; organization?: OrganizationType } =
-        await apiPost(
-          `/organizations/${organization?.id}/checkDomainVerification`,
-          {
-            body: { domain }
-          }
-        );
-      if (resp.success && resp.organization) {
-        setOrganization(resp.organization);
-        setDialog({ open: false });
-        setFeedbackMessage({
-          message: 'Domain ' + inputValue + ' successfully verified!',
-          type: 'success'
-        });
-      } else {
-        setDialog({
-          ...dialog,
-          domainVerificationStatusMessage:
-            'Record not yet found. Note that DNS records may take up to 72 hours to propagate. You can come back later to check the verification status.'
-        });
-      }
-    } catch (e: any) {
-      setFeedbackMessage({
-        message:
-          e.status === 422
-            ? 'Error verifying domain'
-            : e.message ?? e.toString(),
-        type: 'error'
-      });
-      console.error(e);
-    }
-  };
-
   useEffect(() => {
     fetchOrganization();
   }, [fetchOrganization]);
 
-  const filter = createFilterOptions<AutocompleteType>();
-
-  const ListInput = (props: {
-    type: 'rootDomains' | 'ipBlocks' | 'tags';
-    label: string;
-  }) => {
-    if (!organization) return null;
-    const elements: (string | OrganizationTag)[] = organization[props.type];
-    return (
-      <Grid container spacing={1}>
-        <Grid item xs={12} sm={3} lg={2} my={1}>
-          <Typography variant="body2">{props.label}</Typography>
-        </Grid>
-        {elements &&
-          elements.map((value: string | OrganizationTag, index: number) => (
-            <Grid item mb={1} key={index}>
-              <Chip
-                color={'primary'}
-                className={organizationClasses.chip}
-                label={typeof value === 'string' ? value : value.name}
-                onDelete={() => {
-                  organization[props.type].splice(index, 1);
-                  setOrganization({ ...organization });
-                }}
-              ></Chip>
-            </Grid>
-          ))}
-        {props.type === 'rootDomains' &&
-          organization.pendingDomains.map((domain, index: number) => (
-            <Grid item mb={1} key={index}>
-              <Chip
-                className={organizationClasses.chip}
-                style={{ backgroundColor: '#C4C4C4' }}
-                label={domain.name + ' (verification pending)'}
-                onDelete={() => {
-                  organization.pendingDomains.splice(index, 1);
-                  setOrganization({ ...organization });
-                }}
-                onClick={() => {
-                  setInputValue(domain.name);
-                  setDialog({
-                    open: true,
-                    type: props.type,
-                    label: props.label,
-                    stage: 1
-                  });
-                }}
-              ></Chip>
-            </Grid>
-          ))}
-        {(props.type === 'rootDomains' || user?.userType === 'globalAdmin') && (
-          <Grid item mb={1}>
-            <Chip
-              label="ADD"
-              variant="outlined"
-              color="secondary"
-              onClick={() => {
-                setDialog({
-                  open: true,
-                  type: props.type,
-                  label: props.label,
-                  stage: 0
-                });
-              }}
-            />
-          </Grid>
-        )}
-      </Grid>
-    );
-  };
-
   if (!organization) return null;
 
   const views = [
     <Paper key={0}>
-      <Dialog
-        open={dialog.open}
-        onClose={() => setDialog({ open: false })}
-        aria-labelledby="form-dialog-title"
-        maxWidth="xs"
-        fullWidth
-      >
-        <DialogTitle id="form-dialog-title">
-          Add {dialog.label && dialog.label.slice(0, -1)}
-        </DialogTitle>
-        <DialogContent>
-          {dialog.type === 'tags' ? (
-            <>
-              <DialogContentText>
-                Select an existing tag or add a new one.
-              </DialogContentText>
-              <Autocomplete
-                value={tagValue}
-                onChange={(event, newValue) => {
-                  if (typeof newValue === 'string') {
-                    setTagValue({
-                      name: newValue
-                    });
-                  } else {
-                    setTagValue(newValue);
-                  }
-                }}
-                filterOptions={(options, params) => {
-                  const filtered = filter(options, params);
-                  // Suggest the creation of a new value
-                  if (
-                    params.inputValue !== '' &&
-                    !filtered.find(
-                      (tag) =>
-                        tag.name?.toLowerCase() ===
-                        params.inputValue.toLowerCase()
-                    )
-                  ) {
-                    filtered.push({
-                      name: params.inputValue,
-                      title: `Add "${params.inputValue}"`
-                    });
-                  }
-                  return filtered;
-                }}
-                selectOnFocus
-                clearOnBlur
-                handleHomeEndKeys
-                options={tags}
-                getOptionLabel={(option) => {
-                  if (typeof option === 'string') {
-                    return option;
-                  }
-                  return (option as AutocompleteType).name ?? '';
-                }}
-                renderOption={(props, option) => {
-                  if (option.title) return option.title;
-                  return option.name ?? '';
-                }}
-                fullWidth
-                freeSolo
-                renderInput={(params) => (
-                  <TextField {...params} variant="outlined" />
-                )}
-              />
-            </>
-          ) : dialog.type === 'rootDomains' && dialog.stage === 1 ? (
-            <>
-              <DialogContentText>
-                Add the following TXT record to {inputValue}&apos;s DNS
-                configuration and click Verify.
-              </DialogContentText>
-              <TextField
-                style={{ width: '100%' }}
-                value={
-                  organization.pendingDomains.find(
-                    (domain) => domain.name === inputValue
-                  )?.token
-                }
-                onFocus={(event) => {
-                  event.target.select();
-                }}
-              />
-              {dialog.domainVerificationStatusMessage && (
-                <>
-                  <br></br>
-                  <br></br>
-                  <DialogContentText>
-                    {dialog.domainVerificationStatusMessage}
-                  </DialogContentText>
-                </>
-              )}
-            </>
-          ) : user?.userType === 'globalAdmin' ? (
-            <>
-              <DialogContentText>
-                Separate multiple entries by commas.
-              </DialogContentText>
-              <TextField
-                autoFocus
-                margin="dense"
-                id="name"
-                inputProps={{ maxLength: 255 }}
-                label={dialog.label && dialog.label.slice(0, -1)}
-                type="text"
-                fullWidth
-                onChange={(e) => setInputValue(e.target.value)}
-              />
-            </>
-          ) : dialog.type === 'rootDomains' && dialog.stage === 0 ? (
-            <>
-              <DialogContentText>
-                In order to add a root domain, you will need to verify ownership
-                of the domain.
-              </DialogContentText>
-              <TextField
-                autoFocus
-                margin="dense"
-                id="name"
-                label={dialog.label && dialog.label.slice(0, -1)}
-                type="text"
-                fullWidth
-                onChange={(e) => setInputValue(e.target.value)}
-              />
-            </>
-          ) : (
-            <></>
-          )}
-        </DialogContent>
-        <DialogActions>
-          <Button variant="outlined" onClick={() => setDialog({ open: false })}>
-            Cancel
-          </Button>
-          <Button
-            variant="contained"
-            color="primary"
-            onClick={() => {
-              if (
-                dialog.type === 'rootDomains' &&
-                user?.userType !== 'globalAdmin'
-              ) {
-                if (dialog.stage === 0) {
-                  // Start verification process
-                  initiateDomainVerification(inputValue);
-                  setDialog({ ...dialog, stage: 1 });
-                  return;
-                } else {
-                  checkDomainVerification(inputValue);
-                  return;
-                }
-              } else if (dialog.type && dialog.type !== 'tags') {
-                if (inputValue) {
-                  // Allow adding multiple values with a comma delimiter
-                  organization[dialog.type].push(
-                    ...inputValue.split(',').map((e) => e.trim())
-                  );
-                  setOrganization({ ...organization });
-                }
-              } else {
-                if (tagValue) {
-                  if (!organization.tags) organization.tags = [];
-                  organization.tags.push(tagValue as any);
-                  setOrganization({ ...organization });
-                }
-              }
-              setDialog({ open: false });
-              setInputValue('');
-              setTagValue(null);
-            }}
-          >
-            {dialog.type === 'rootDomains' && user?.userType !== 'globalAdmin'
-              ? dialog.stage === 0
-                ? 'Next'
-                : 'Verify'
-              : 'Add'}
-          </Button>
-        </DialogActions>
-      </Dialog>
-      <Grid container spacing={1} p={3}>
-        <Grid item xs={12}>
-          <TextField
-            value={organization.name}
-            disabled
-            variant="standard"
-            InputProps={{
-              className: organizationClasses.orgName
-            }}
-          ></TextField>
-        </Grid>
-        <Grid item xs={12}>
-          <ListInput label="Root Domains" type="rootDomains"></ListInput>
-        </Grid>
-        <Grid item xs={12}>
-          <ListInput label="IP Blocks" type="ipBlocks"></ListInput>
-        </Grid>
-        {user?.userType === 'globalAdmin' && (
-          <Grid item xs={12}>
-            <ListInput label="Tags" type="tags"></ListInput>
-          </Grid>
-        )}
-        <Grid item xs={12}>
-          <Grid container spacing={1}>
-            <Grid item xs={12} sm={3} lg={2} my={1}>
-              <Typography variant="body2">Passive Mode</Typography>
-            </Grid>
-            <Grid item ml={-1}>
-              <SwitchInput
-                checked={organization.isPassive}
-                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                  setOrganization({
-                    ...organization,
-                    isPassive: event.target.checked
-                  });
-                }}
-                color="primary"
-              />
-            </Grid>
-          </Grid>
-        </Grid>
-        <Grid item xs={12}>
-          <Link to={`/organizations`}>
-            <Button
-              variant="outlined"
-              style={{ marginRight: '10px', color: '#565C65' }}
-            >
-              Cancel
-            </Button>
-          </Link>
-          <Button
-            variant="contained"
-            onClick={updateOrganization}
-            style={{ background: '#565C65', color: 'white' }}
-          >
-            Save
-          </Button>
-        </Grid>
-      </Grid>
+      <OrgSettings
+        organization={organization}
+        setOrganization={setOrganization}
+        tags={tags}
+      />
     </Paper>,
     <React.Fragment key={1}>
       <OrgMembers
@@ -651,12 +79,11 @@ export const Organization: React.FC = () => {
       />
     </React.Fragment>,
     <React.Fragment key={2}>
-      <OrganizationList parent={organization}></OrganizationList>
-    </React.Fragment>,
-    <React.Fragment key={3}>
-      <Table<Scan> columns={scanColumns} data={scans} fetchData={fetchScans} />
-      <h2>Organization Scan History</h2>
-      <Table<ScanTask> columns={scanTaskColumns} data={scanTasks} />
+      <OrgScanHistory
+        organization={organization}
+        setOrganization={setOrganization}
+        scanTasks={scanTasks}
+      />
     </React.Fragment>
   ];
 
diff --git a/frontend/src/pages/Organization/style.ts b/frontend/src/pages/Organization/style.ts
deleted file mode 100644
index f30b2c22..00000000
--- a/frontend/src/pages/Organization/style.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { styled } from '@mui/material/styles';
-
-const PREFIX = 'Organization';
-
-export const organizationClasses = {
-  header: `${PREFIX}-header`,
-  headerLabel: `${PREFIX}-headerLabel`,
-  chip: `${PREFIX}-chip`,
-  settingsWrapper: `${PREFIX}-settingsWrapper`,
-  buttons: `${PREFIX}-buttons`,
-  orgName: `${PREFIX}-orgName`,
-  textField: `${PREFIX}-textField`,
-  root: `${PREFIX}-root`,
-  headerRow: `${PREFIX}-headerRow`
-};
-
-export const OrganizationRoot = styled('div')(({ theme }) => ({
-  [`& .${organizationClasses.header}`]: {
-    background: '#F9F9F9'
-  },
-
-  [`& .${organizationClasses.headerLabel}`]: {
-    margin: 0,
-    paddingTop: '1.5rem',
-    paddingBottom: '0.5rem',
-    marginLeft: '15%',
-    color: '#C9C9C9',
-    fontWeight: 500,
-    fontStyle: 'normal',
-    fontSize: '24px',
-    '& a': {
-      textDecoration: 'none',
-      color: '#C9C9C9'
-    },
-    '& svg': {
-      verticalAlign: 'middle',
-      lineHeight: '100%',
-      fontSize: '26px'
-    }
-  },
-
-  [`& .${organizationClasses.chip}`]: {
-    color: 'white',
-    marginRight: '10px',
-    marginTop: '10px'
-  },
-
-  [`& .${organizationClasses.settingsWrapper}`]: {
-    boxSizing: 'border-box',
-    border: '0px',
-    boxShadow: 'none',
-    borderRadius: '0px',
-    padding: '25px',
-    maxWidth: '900px',
-    margin: '0 auto'
-  },
-
-  [`& .${organizationClasses.buttons}`]: {
-    display: 'flex',
-    justifyContent: 'flex-end'
-  },
-
-  [`& .${organizationClasses.orgName}`]: {
-    background: '#F5F5F5 !important',
-    paddingBottom: '10px'
-  },
-
-  [`& .${organizationClasses.textField}`]: {
-    background: '#F5F5F5 !important'
-  },
-
-  [`& .${organizationClasses.root}`]: {
-    maxWidth: '1400px',
-    margin: '0 auto',
-    '@media screen and (min-width: 480px)': {
-      padding: '1rem 1rem'
-    },
-    '@media screen and (min-width: 640px)': {
-      padding: '1rem 1.5rem'
-    },
-    '@media screen and (min-width: 1024px)': {
-      padding: '1rem 2rem'
-    }
-  },
-
-  [`& .${organizationClasses.headerRow}`]: {
-    padding: '0.5rem 0',
-    width: '100%',
-    display: 'flex',
-    alignItems: 'center',
-    fontSize: '16px',
-    flexWrap: 'wrap',
-    '& label': {
-      flex: '1 0 100%',
-      fontWeight: 'bolder',
-      display: 'flex',
-      alignItems: 'center',
-      padding: '0.5rem 0',
-      '@media screen and (min-width: 640px)': {
-        flex: '0 0 220px',
-        padding: 0
-      }
-    },
-    '& span': {
-      display: 'block',
-      flex: '1 1 auto',
-      marginLeft: 'calc(1rem + 20px)',
-      '@media screen and (min-width: 640px)': {
-        marginLeft: 'calc(1rem + 20px)'
-      },
-      '@media screen and (min-width: 1024px)': {
-        marginLeft: 0
-      }
-    }
-  }
-}));
diff --git a/frontend/src/pages/RegionUsers/RegionUsers.tsx b/frontend/src/pages/RegionUsers/RegionUsers.tsx
index 43144a53..30fbfbae 100644
--- a/frontend/src/pages/RegionUsers/RegionUsers.tsx
+++ b/frontend/src/pages/RegionUsers/RegionUsers.tsx
@@ -15,6 +15,7 @@ import {
 import DoneIcon from '@mui/icons-material/Done';
 import { CheckCircleOutline as CheckIcon } from '@mui/icons-material';
 import CloseIcon from '@mui/icons-material/Close';
+import { useUserLevel } from 'hooks/useUserLevel';
 
 type DialogStates = {
   isOrgDialogOpen: boolean;
@@ -44,6 +45,7 @@ export const RegionUsers: React.FC = () => {
   const apiRefPendingUsers = useGridApiRef();
   const apiRefCurrentUsers = useGridApiRef();
   const regionalAdminId = user?.regionId;
+  const { formattedUserType } = useUserLevel();
   const getOrgsURL = `/organizations/regionId/`;
   const getUsersURL = `/v2/users?invitePending=`;
   const pendingCols: GridColDef[] = [
@@ -127,7 +129,7 @@ export const RegionUsers: React.FC = () => {
     getDeleteError: ''
   });
   const [selectedUser, selectUser] = useState<User>(initializeUser);
-  const [selectedOrgRows, selectOrgRows] = useState<GridRowSelectionModel>([]);
+  const [selectedOrg, selectOrg] = useState<GridRowSelectionModel>([]);
   const [organizations, setOrganizations] = useState<OrganizationType[]>([]);
   const [pendingUsers, setPendingUsers] = useState<User[]>([]);
   const [currentUsers, setCurrentUsers] = useState<User[]>([]);
@@ -137,7 +139,10 @@ export const RegionUsers: React.FC = () => {
     try {
       const rows = await apiGet<OrganizationType[]>(getOrgsURL + row.regionId);
       setOrganizations(rows);
-      setErrorStates({ ...errorStates, getOrgsError: '' });
+      if (row.roles.length > 0) {
+        selectOrg([row.roles[0].organization.id]);
+      }
+      setErrorStates({ ...errorStates, getOrgsError: '', getUpdateError: '' });
     } catch (e: any) {
       setErrorStates({ ...errorStates, getOrgsError: e.message });
     }
@@ -281,7 +286,7 @@ export const RegionUsers: React.FC = () => {
   };
 
   const handleApproveClick = (row: typeof initializeUser) => {
-    selectOrgRows([]);
+    selectOrg([]);
     setDialogStates({
       ...dialogStates,
       isOrgDialogOpen: true
@@ -313,31 +318,74 @@ export const RegionUsers: React.FC = () => {
     selectUser(initializeUser);
   };
 
-  const handleApproveConfirmClick = async () => {
-    const success = await addOrgToUser(selectedUser.id, selectedOrgRows[0]);
-    if (success) {
-      handleCloseDialog('closeButtonClick');
-      setDialogStates((prevState) => ({
-        ...prevState,
-        isInfoDialogOpen: true
-      }));
-      setInfoDialogContent(
-        `The user has been approved and is a member of Region ${selectedUser.regionId}.`
+  const removeOrgFromUser = useCallback(
+    (orgId: String, roleId: String) => {
+      apiPost(`/organizations/${orgId}/roles/${roleId}/remove`, {
+        body: {}
+      }).then(
+        (res) => {
+          console.log(res);
+        },
+        (e) => {
+          setErrorStates({ ...errorStates, getUpdateError: e.message });
+        }
       );
+    }, // eslint-disable-next-line react-hooks/exhaustive-deps
+    [apiPost]
+  );
+
+  const handleApproveConfirmClick = async () => {
+    try {
+      const userHadOrg = selectedUser.roles.length > 0;
+      const originalOrgId = userHadOrg
+        ? selectedUser.roles[0].organization.id
+        : '';
+      const selectedOrgId = selectedOrg[0].toString();
+      let success = false;
+      // If the user's org was already added and not modified, only update the user.
+      if (userHadOrg && originalOrgId === selectedOrgId) {
+        success = await updateUser(
+          selectedUser.id,
+          selectedUser.roles[0].organization.name
+        );
+        // If the user now has a different org than before, remove the previous org.
+      } else if (userHadOrg && originalOrgId !== selectedOrgId) {
+        // TODO: Make a new API endpoint to update Org for User instead of doing a removal and addition.
+        removeOrgFromUser(originalOrgId, selectedUser.roles[0].id);
+        success = await addOrgToUser(selectedUser.id, selectedOrgId);
+        // If the previous operation was successful or if the user had no previous org,
+        // add the user to the selected org which then also updates the user.
+      } else {
+        success = await addOrgToUser(selectedUser.id, selectedOrgId);
+      }
+      if (success) {
+        handleCloseDialog('closeButtonClick');
+        setDialogStates((prevState) => ({
+          ...prevState,
+          isInfoDialogOpen: true
+        }));
+        setInfoDialogContent(
+          `The user has been approved and is a member of Region ${selectedUser.regionId}.`
+        );
+      } else {
+        throw new Error('Failed to approve the user.');
+      }
+    } catch (e: any) {
+      setErrorStates({ ...errorStates, getUpdateError: e.message });
     }
   };
-
   const onRowSelectionModelChange = (newRowSelectionModel: any) => {
     if (newRowSelectionModel.length > 1) {
-      const selectionSet = new Set(selectedOrgRows);
+      const selectionSet = new Set(selectedOrg);
       const result = newRowSelectionModel.filter(
         (s: any) => !selectionSet.has(s)
       );
-      selectOrgRows(result);
+      selectOrg(result);
     } else {
-      selectOrgRows(newRowSelectionModel);
+      selectOrg(newRowSelectionModel);
     }
   };
+
   return (
     <Box m={5} sx={{ minHeight: '1500px' }}>
       <Box
@@ -349,8 +397,7 @@ export const RegionUsers: React.FC = () => {
       >
         <Box sx={{ m: 'auto', maxWidth: '1500px', px: 2, py: 5 }}>
           <Typography variant="h1" style={{ fontSize: '2.125rem' }}>
-            {user?.userType === 'regionalAdmin' && `Region ${regionalAdminId} `}
-            User Registration Dashboard
+            {`${formattedUserType} Dashboard`}
           </Typography>
           <br />
           <Typography
@@ -415,7 +462,7 @@ export const RegionUsers: React.FC = () => {
               <DataGrid
                 checkboxSelection
                 onRowSelectionModelChange={onRowSelectionModelChange}
-                rowSelectionModel={selectedOrgRows}
+                rowSelectionModel={selectedOrg}
                 rows={organizations}
                 columns={orgCols}
                 slots={{ toolbar: GridToolbar }}
@@ -424,6 +471,12 @@ export const RegionUsers: React.FC = () => {
                     showQuickFilter: true
                   }
                 }}
+                sx={{
+                  '& .MuiDataGrid-columnHeaderCheckbox .MuiDataGrid-columnHeaderTitleContainer':
+                    {
+                      display: 'none'
+                    }
+                }}
               />
             </Box>
             {errorStates.getOrgsError && (
@@ -431,7 +484,7 @@ export const RegionUsers: React.FC = () => {
                 Error retrieving organizations: {errorStates.getOrgsError}
               </Alert>
             )}
-            {selectedOrgRows.length !== 0 &&
+            {selectedOrg.length !== 0 &&
               errorStates.getUpdateError.length === 0 && (
                 <Alert severity="info">
                   {selectedUser.fullName} will become a member of the selected
@@ -446,7 +499,7 @@ export const RegionUsers: React.FC = () => {
             )}
           </>
         }
-        disabled={selectedOrgRows.length === 0 ? true : false}
+        disabled={selectedOrg.length === 0 ? true : false}
         screenWidth="lg"
       />
       <ConfirmDialog
diff --git a/frontend/src/pages/Risk/Risk.tsx b/frontend/src/pages/Risk/Risk.tsx
index b664b3f3..02aac9f1 100644
--- a/frontend/src/pages/Risk/Risk.tsx
+++ b/frontend/src/pages/Risk/Risk.tsx
@@ -25,7 +25,7 @@ import {
   ORGANIZATION_FILTER_KEY,
   OrganizationShallow,
   REGION_FILTER_KEY
-} from 'components/OrganizationSearch';
+} from 'components/RegionAndOrganizationFilters';
 import { withSearch } from '@elastic/react-search-ui';
 
 export interface Point {
@@ -54,7 +54,7 @@ let colorScale = scaleLinear<string>()
   .domain([0, 1])
   .range(['#c7e8ff', '#135787']);
 
-const Risk: React.FC<ContextType & {}> = ({ filters }) => {
+const Risk: React.FC<ContextType & {}> = ({ filters, addFilter }) => {
   const { showMaps, user, apiPost } = useAuthContext();
 
   const [stats, setStats] = useState<Stats | undefined>(undefined);
@@ -102,7 +102,8 @@ const Risk: React.FC<ContextType & {}> = ({ filters }) => {
         .range(['#c7e8ff', '#135787']);
       setStats(result);
     },
-    [apiPost, riskFilters]
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [riskFilters]
   );
 
   useEffect(() => {
diff --git a/frontend/src/pages/Risk/TopVulnerableDomains.tsx b/frontend/src/pages/Risk/TopVulnerableDomains.tsx
index 53f79bd5..307f70f9 100644
--- a/frontend/src/pages/Risk/TopVulnerableDomains.tsx
+++ b/frontend/src/pages/Risk/TopVulnerableDomains.tsx
@@ -70,6 +70,11 @@ const TopVulnerableDomains = (props: { data: Point[] }) => {
   //Custom Bar Layer to allow for top to bottom tab navigation
   const CustomBarLayer = ({ bars }: { bars: any[]; [key: string]: any }) => {
     const reversedBars = [...bars].reverse();
+    const filteredVulnTableLink = '/inventory/vulnerabilities';
+    const filteredVulnTableLinkHandler = (
+      filteredVulnTableLink: string,
+      domain: string
+    ) => history.push(filteredVulnTableLink, { domain: domain });
     return reversedBars.map((bar) => (
       <Tooltip
         arrow
@@ -100,10 +105,20 @@ const TopVulnerableDomains = (props: { data: Point[] }) => {
           } in Domain:${' '}
           ${bar.data.indexValue}`}
             onClick={() => {
-              history.push(
-                `/inventory/vulnerabilities?domain=${bar.data.label}&severity=${bar.data.id}`
+              filteredVulnTableLinkHandler(
+                filteredVulnTableLink,
+                bar.data.indexValue
               );
             }}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                filteredVulnTableLinkHandler(
+                  filteredVulnTableLink,
+                  bar.data.indexValue
+                );
+              }
+            }}
           />
         </g>
       </Tooltip>
diff --git a/frontend/src/pages/Risk/TopVulnerablePorts.tsx b/frontend/src/pages/Risk/TopVulnerablePorts.tsx
index cad9da61..564174ca 100644
--- a/frontend/src/pages/Risk/TopVulnerablePorts.tsx
+++ b/frontend/src/pages/Risk/TopVulnerablePorts.tsx
@@ -5,50 +5,82 @@ import { useHistory } from 'react-router-dom';
 import { getSingleColor } from './utils';
 import * as RiskStyles from './style';
 import { Paper, Tooltip } from '@mui/material';
+import { ContextType } from 'context';
+import { withSearch } from '@elastic/react-search-ui';
 
-const TopVulnerablePorts = (props: { data: Point[] }) => {
-  const CustomBarLayer = ({ bars }: { bars: any[]; [key: string]: any }) => {
-    const reversedBars = [...bars].reverse();
-    return reversedBars.map((bar) => (
-      <Tooltip
-        title={
-          <span>
-            {bar.data.value} domains with vulnerabilities on port{' '}
-            {bar.data.indexValue}
-          </span>
-        }
-        placement="right"
-        arrow
-        key={bar.key}
-      >
-        <g key={bar.key}>
-          <rect
-            role="button"
-            key={bar.key}
-            x={bar.x}
-            y={bar.y}
-            width={bar.width}
-            height={bar.height}
-            fill={bar.color}
-            tabIndex={0}
-            aria-label={`${
-              bar.data.value
-            }${' '}domains with vulnerabilities on port${' '}
-            ${bar.data.indexValue}`}
-            //To-do: Fix onClick so that User is routed to Inventory page with Port # pre-selected as a filter
-            onClick={() => {
-              console.log('clicked label value: ', bar);
-              history.push(
-                `/inventory?filters[0][field]=services.port&filters[0][values][0]=n_${bar.data.indexValue}_n&filters[0][type]=any`
-              );
-              window.location.reload();
-            }}
-          />
-        </g>
-      </Tooltip>
-    ));
-  };
+const CustomBarLayer = ({
+  bars,
+  addFilter,
+  removeFilter,
+  filters
+}: {
+  bars: any[];
+  [key: string]: any;
+  addFilter: ContextType['addFilter'];
+  removeFilter: ContextType['removeFilter'];
+  filters: any[];
+}) => {
+  const reversedBars = [...bars].reverse();
   const history = useHistory();
+
+  return reversedBars.map((bar) => (
+    <Tooltip
+      title={
+        <span>
+          {bar.data.value} domains with vulnerabilities on port{' '}
+          {bar.data.indexValue}
+        </span>
+      }
+      placement="right"
+      arrow
+      key={bar.key}
+    >
+      <g key={bar.key}>
+        <rect
+          role="button"
+          key={bar.key}
+          x={bar.x}
+          y={bar.y}
+          width={bar.width}
+          height={bar.height}
+          fill={bar.color}
+          tabIndex={0}
+          aria-label={`${
+            bar.data.value
+          }${' '}domains with vulnerabilities on port${' '}
+          ${bar.data.indexValue}`}
+          onClick={() => {
+            const servicesPort = filters.find(
+              (filter) => filter.field === 'services.port'
+            );
+            if (servicesPort) {
+              removeFilter(
+                'services.port',
+                parseInt(servicesPort.values[0], 10),
+                'any'
+              );
+              addFilter('services.port', parseInt(bar.data.indexValue), 'any');
+              history.push('/inventory');
+            } else {
+              addFilter('services.port', parseInt(bar.data.indexValue), 'any');
+              history.push('/inventory');
+            }
+          }}
+        />
+      </g>
+    </Tooltip>
+  ));
+};
+
+const CustomBarLayerWithSearch = withSearch(
+  ({ addFilter, filters, removeFilter }: ContextType) => ({
+    addFilter,
+    filters,
+    removeFilter
+  })
+)(CustomBarLayer);
+
+export const TopVulnerablePorts = (props: { data: Point[] }) => {
   const { data } = props;
   const { cardRoot, cardSmall, header, chartSmall } = RiskStyles.classesRisk;
   const dataVal = data
@@ -64,7 +96,7 @@ const TopVulnerablePorts = (props: { data: Point[] }) => {
           <ResponsiveBar
             data={dataVal as any}
             keys={['Port']}
-            layers={['grid', 'axes', CustomBarLayer]}
+            layers={['grid', 'axes', CustomBarLayerWithSearch]}
             indexBy="label"
             margin={{ top: 30, right: 40, bottom: 75, left: 100 }}
             theme={{
diff --git a/frontend/src/pages/Risk/VulnerabilityBarChart.tsx b/frontend/src/pages/Risk/VulnerabilityBarChart.tsx
index e7f1f37a..aa1214dd 100644
--- a/frontend/src/pages/Risk/VulnerabilityBarChart.tsx
+++ b/frontend/src/pages/Risk/VulnerabilityBarChart.tsx
@@ -23,6 +23,11 @@ const VulnerabilityBarChart = (props: {
   const { cardRoot, cardSmall, header, chartSmall } = RiskStyles.classesRisk;
   const [ariaLabel, setAriaLabel] = useState('');
   const ariaLiveRef = useRef<HTMLDivElement>(null);
+  const filteredVulnTableLink = '/inventory/vulnerabilities';
+  const filteredVulnTableLinkHandler = (
+    filteredVulnTableLink: string,
+    severity: string
+  ) => history.push(filteredVulnTableLink, { severity: severity });
 
   const CustomBarLayer = ({ bars }: { bars: any[]; [key: string]: any }) => (
     <>
@@ -45,10 +50,19 @@ const VulnerabilityBarChart = (props: {
               tabIndex={0}
               aria-label={`${bar.data.value} ${bar.data.indexValue} level severities in this organization.`}
               onClick={() => {
-                //To-Do: Fix onClick so that it correctly sends user to All Vulns table with severity level as a filter.
                 if (type === 'vulns') {
-                  history.push(
-                    `/inventory/vulnerabilities?severity=${bar.indexValue}`
+                  filteredVulnTableLinkHandler(
+                    `${filteredVulnTableLink}`,
+                    `${bar.data.indexValue}`
+                  );
+                }
+              }}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter' || e.key === ' ') {
+                  e.preventDefault();
+                  filteredVulnTableLinkHandler(
+                    filteredVulnTableLink,
+                    bar.data.indexValue
                   );
                 }
               }}
diff --git a/frontend/src/pages/Risk/VulnerabilityCard.tsx b/frontend/src/pages/Risk/VulnerabilityCard.tsx
index 8f6c33ab..ee681108 100644
--- a/frontend/src/pages/Risk/VulnerabilityCard.tsx
+++ b/frontend/src/pages/Risk/VulnerabilityCard.tsx
@@ -56,9 +56,8 @@ const VulnerabilityCard = (props: {
     title: string
   ) => history.push(filteredVulnTableLink, { title: title });
 
-  const vulnerabilityGridContent = data.slice(0, 4).map((vuln) => {
-    const filteredVulnTableLink =
-      '/inventory/vulnerabilities?sort=createdAt&desc=false';
+  const vulnerabilityGridContent = data.slice(0, 10).map((vuln) => {
+    const filteredVulnTableLink = '/inventory/vulnerabilities';
     const ariaLabel = `Details link to the vulnerabilities table filtered to ${vuln.title}.`;
     const onRowKeyDown = (event: React.KeyboardEvent) => {
       if (event.key === 'Enter' || event.key === ' ') {
diff --git a/frontend/src/pages/Risk/style.ts b/frontend/src/pages/Risk/style.ts
index 09340856..2c01bf4b 100644
--- a/frontend/src/pages/Risk/style.ts
+++ b/frontend/src/pages/Risk/style.ts
@@ -62,7 +62,7 @@ export const RiskRoot = styled('div')(({ theme }) => ({
     '& h3': {
       textAlign: 'center'
     },
-    overflow: 'hidden'
+    overflow: 'auto'
   },
   [`& .${classesRisk.chartSmall}`]: {
     height: '85%'
diff --git a/frontend/src/pages/Scans/ScanTasksView.tsx b/frontend/src/pages/Scans/ScanTasksView.tsx
index 2557f58a..90c37d10 100644
--- a/frontend/src/pages/Scans/ScanTasksView.tsx
+++ b/frontend/src/pages/Scans/ScanTasksView.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { Query, Scan } from 'types';
-import { ScanTask } from 'types';
+import { OrgQuery } from 'types/org-query';
+import { Scan, ScanTask } from 'types';
 import { useAuthContext } from 'context';
 // @ts-ignore:next-line
 import { formatDistanceToNow, parseISO } from 'date-fns';
@@ -117,7 +117,7 @@ export const ScanTasksView: React.FC = () => {
   const PAGE_SIZE = 15;
 
   const fetchScanTasks = useCallback(
-    async (query: Query<ScanTask>) => {
+    async (query: OrgQuery<ScanTask>) => {
       const { page, sort, filters } = query;
       try {
         const tableFilters: {
diff --git a/frontend/src/pages/Scans/ScansView.tsx b/frontend/src/pages/Scans/ScansView.tsx
index f255224e..bbac13c9 100644
--- a/frontend/src/pages/Scans/ScansView.tsx
+++ b/frontend/src/pages/Scans/ScansView.tsx
@@ -1,5 +1,6 @@
 import classes from './Scans.module.scss';
 import React, { useCallback, useRef, useState } from 'react';
+// TODO: Refactor to use Material-UI components
 import {
   Button,
   Modal,
@@ -22,9 +23,19 @@ import { formatDistanceToNow, parseISO } from 'date-fns';
 import { setFrequency } from 'pages/Scan/Scan';
 import { ScanForm, ScanFormValues } from 'components/ScanForm';
 import { DataGrid, GridColDef, GridRenderCellParams } from '@mui/x-data-grid';
-import { Alert, Box, IconButton, Paper } from '@mui/material';
+import {
+  Alert,
+  Button as MuiButton,
+  Box,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  IconButton,
+  Paper,
+  DialogTitle
+} from '@mui/material';
 //Needed for the CustomToolbar:
-// import { Button as MuiButton } from '@mui/material';
 // import CustomToolbar from 'components/DataGrid/CustomToolbar';
 // import { Add, Publish } from '@mui/icons-material';
 
@@ -60,6 +71,7 @@ const ScansView: React.FC = () => {
   const [scanSchema, setScanSchema] = useState<ScanSchema>({});
   const deleteModalRef = useRef<ModalRef>(null);
   const [errors, setErrors] = useState<Errors>({});
+  const [open, setOpen] = useState(false);
 
   const [values] = useState<ScanFormValues>({
     name: 'censys',
@@ -155,6 +167,18 @@ const ScansView: React.FC = () => {
     await invokeScheduler();
   };
 
+  const handleSubmit = () => {
+    runScan(selectedId);
+    setOpen(false);
+  };
+  const handleClose = () => {
+    setOpen(false);
+  };
+
+  const handleClick = () => {
+    setOpen(true);
+  };
+
   //Code for new table//
 
   React.useEffect(() => {
@@ -194,7 +218,9 @@ const ScansView: React.FC = () => {
             tabIndex={cellValues.tabIndex}
             color="primary"
             onClick={() => {
-              runScan(cellValues.row.id);
+              setSelectedId(cellValues.row.id);
+              setSelectedName(cellValues.row.name);
+              handleClick();
             }}
           >
             <FaPlayCircle />
@@ -266,6 +292,34 @@ const ScansView: React.FC = () => {
   return (
     <>
       <Box mb={3}>
+        <Dialog
+          open={open}
+          onClose={handleClose}
+          aria-labelledby="run-scan-dialog-title"
+          aria-describedby="run-scan-dialog-description"
+        >
+          <DialogTitle id="run-scan-dialog-title">Confirmation</DialogTitle>
+          <DialogContent>
+            <DialogContentText id="run-scan-dialog-description">
+              Are you sure you would like to run the {selectedName} scan?
+            </DialogContentText>
+          </DialogContent>
+          <DialogActions>
+            <MuiButton
+              onClick={handleClose}
+              aria-label="Cancel running the scan"
+            >
+              Cancel
+            </MuiButton>
+            <MuiButton
+              variant="contained"
+              onClick={handleSubmit}
+              aria-label="Confirm and run the scan"
+            >
+              Run
+            </MuiButton>
+          </DialogActions>
+        </Dialog>
         <Paper elevation={0}>
           {scans?.length === 0 ? (
             <Alert severity="info">No scans found</Alert>
@@ -319,7 +373,6 @@ const ScansView: React.FC = () => {
           setScans(scans.concat(...createdScans));
         }}
       />
-
       <Modal ref={deleteModalRef} id="deleteModal">
         <ModalHeading>Delete scan?</ModalHeading>
         <p>
diff --git a/frontend/src/pages/Search/Dashboard.tsx b/frontend/src/pages/Search/Dashboard.tsx
deleted file mode 100644
index 16e911ac..00000000
--- a/frontend/src/pages/Search/Dashboard.tsx
+++ /dev/null
@@ -1,458 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { classes, Root } from './Styling/dashboardStyle';
-import { Subnav } from 'components';
-import { ResultCard } from './ResultCard';
-import {
-  Button,
-  Paper,
-  FormControl,
-  Select,
-  MenuItem,
-  Typography,
-  Checkbox,
-  FormControlLabel,
-  FormGroup,
-  TextareaAutosize,
-  ButtonGroup,
-  Box
-} from '@mui/material';
-import { Pagination } from '@mui/material';
-import { withSearch } from '@elastic/react-search-ui';
-import { ContextType } from '../../context/SearchProvider';
-import { SortBar } from './SortBar';
-import {
-  Modal,
-  TextInput,
-  Label,
-  Dropdown,
-  ModalFooter,
-  ModalHeading,
-  ModalRef
-} from '@trussworks/react-uswds';
-import { ModalToggleButton } from 'components';
-import { useAuthContext } from 'context';
-import { FilterTags } from './FilterTags';
-import { SavedSearch, Vulnerability } from 'types';
-import { useBeforeunload } from 'react-beforeunload';
-import { NoResults } from 'components/NoResults';
-import { exportCSV } from 'components/ImportExport';
-import { useHistory } from 'react-router-dom';
-
-export const DashboardUI: React.FC<ContextType & { location: any }> = (
-  props
-) => {
-  const {
-    current,
-    setCurrent,
-    resultsPerPage,
-    setResultsPerPage,
-    filters,
-    removeFilter,
-    results,
-    sortDirection,
-    sortField,
-    setSort,
-    totalPages,
-    totalResults,
-    setSearchTerm,
-    searchTerm,
-    noResults
-  } = props;
-
-  const [selectedDomain, setSelectedDomain] = useState('');
-  const [resultsScrolled] = useState(false);
-  const {
-    apiPost,
-    apiPut,
-    setLoading,
-    showAllOrganizations,
-    currentOrganization
-  } = useAuthContext();
-
-  const search:
-    | (SavedSearch & {
-        editing?: boolean;
-      })
-    | undefined = localStorage.getItem('savedSearch')
-    ? JSON.parse(localStorage.getItem('savedSearch')!)
-    : undefined;
-
-  const history = useHistory();
-  const modalRef = useRef<ModalRef>(null);
-  const [savedSearchValues, setSavedSearchValues] = useState<
-    Partial<SavedSearch> & {
-      name: string;
-      vulnerabilityTemplate: Partial<Vulnerability>;
-    }
-  >(
-    search
-      ? search
-      : {
-          name: '',
-          vulnerabilityTemplate: {},
-          createVulnerabilities: false
-        }
-  );
-
-  const onTextChange: React.ChangeEventHandler<
-    HTMLInputElement | HTMLSelectElement
-  > = (e) => onChange(e.target.name, e.target.value);
-
-  const onChange = (name: string, value: any) => {
-    setSavedSearchValues((values) => ({
-      ...values,
-      [name]: value
-    }));
-  };
-
-  const onVulnerabilityTemplateChange = (e: any) => {
-    (savedSearchValues.vulnerabilityTemplate as any)[e.target.name] =
-      e.target.value;
-    setSavedSearchValues(savedSearchValues);
-  };
-
-  useEffect(() => {
-    if (props.location.search === '') {
-      // Search on initial load
-      setSearchTerm('', { shouldClearFilters: false });
-    }
-    return () => {
-      localStorage.removeItem('savedSearch');
-      setSearchTerm('', { shouldClearFilters: false });
-    };
-  }, [setSearchTerm, props.location.search]);
-
-  useBeforeunload((event) => {
-    localStorage.removeItem('savedSearch');
-  });
-
-  const fetchDomainsExport = async (): Promise<string> => {
-    try {
-      const body: any = {
-        current,
-        filters,
-        resultsPerPage,
-        searchTerm,
-        sortDirection,
-        sortField
-      };
-      if (!showAllOrganizations && currentOrganization) {
-        if ('rootDomains' in currentOrganization)
-          body.organizationId = currentOrganization.id;
-        else body.tagId = currentOrganization.id;
-      }
-      const { url } = await apiPost('/search/export', {
-        body
-      });
-      return url!;
-    } catch (e) {
-      console.error(e);
-      return '';
-    }
-  };
-
-  return (
-    <Root className={classes.root}>
-      <Subnav
-        items={[
-          { title: 'Search Results', path: '/inventory', exact: true },
-          { title: 'All Domains', path: '/inventory/domains' },
-          { title: 'All Vulnerabilities', path: '/inventory/vulnerabilities' }
-        ]}
-        styles={{
-          paddingLeft: '0%'
-        }}
-      />
-      <Box
-        position="relative"
-        height="calc(100% - 32px - 32px - 46px - 10px)"
-        maxHeight="100%"
-        width="100%"
-        display="flex"
-        flexWrap="nowrap"
-        flexDirection="column"
-        alignItems="center"
-        justifyContent="center"
-      >
-        <Box width="90%" height="100%" display="flex" flexDirection="column">
-          <FilterTags filters={filters} removeFilter={removeFilter} />
-          <SortBar
-            sortField={sortField}
-            sortDirection={sortDirection}
-            setSort={setSort}
-            isFixed={resultsScrolled}
-            saveSearch={
-              filters.length > 0 || searchTerm
-                ? () => modalRef.current?.toggleModal(undefined, true)
-                : undefined
-            }
-            existingSavedSearch={search}
-          />
-          <Box
-            height="100%"
-            flexDirection="column"
-            flexWrap="nowrap"
-            gap="1rem"
-            alignItems="stretch"
-            display="flex"
-            // overflow="scroll"
-            position="relative"
-            padding="0 0 2rem 0"
-            sx={{ overflowY: 'auto' }}
-          >
-            {noResults ? (
-              <Box
-                display="flex"
-                flex="1"
-                alignItems="center"
-                justifyContent="center"
-                height="100%"
-              >
-                <NoResults
-                  message={"We don't see any results that match your criteria."}
-                ></NoResults>
-              </Box>
-            ) : (
-              results.map((result) => (
-                <ResultCard
-                  key={result.id.raw}
-                  {...result}
-                  onDomainSelected={(id) => setSelectedDomain(id)}
-                  selected={result.id.raw === selectedDomain}
-                />
-              ))
-            )}
-          </Box>
-        </Box>
-      </Box>
-      <Paper className={classes.pagination}>
-        <span>
-          <strong>
-            {(totalResults === 0
-              ? 0
-              : (current - 1) * resultsPerPage + 1
-            ).toLocaleString()}{' '}
-            -{' '}
-            {Math.min(
-              (current - 1) * resultsPerPage + resultsPerPage,
-              totalResults
-            ).toLocaleString()}
-          </strong>{' '}
-          of <strong>{totalResults.toLocaleString()}</strong>
-        </span>
-        <Pagination
-          count={totalPages}
-          page={current}
-          onChange={(_, page) => setCurrent(page)}
-          color="primary"
-          size="small"
-        />
-        <FormControl
-          variant="outlined"
-          className={classes.pageSize}
-          size="small"
-        >
-          <Typography id="results-per-page-label">Results per page:</Typography>
-          <Select
-            id="teststa"
-            labelId="results-per-page-label"
-            value={resultsPerPage}
-            onChange={(e) => setResultsPerPage(e.target.value as number)}
-          >
-            {[15, 45, 90].map((perPage) => (
-              <MenuItem key={perPage} value={perPage}>
-                {perPage}
-              </MenuItem>
-            ))}
-          </Select>
-        </FormControl>
-        <Button
-          variant="outlined"
-          className={classes.exportButton}
-          onClick={() =>
-            exportCSV(
-              {
-                name: 'domains',
-                getDataToExport: fetchDomainsExport
-              },
-              setLoading
-            )
-          }
-        >
-          Export Results
-        </Button>
-      </Paper>
-
-      <Modal ref={modalRef} id="modal">
-        <ModalHeading>{search ? 'Update Search' : 'Save Search'}</ModalHeading>
-        <FormGroup>
-          <Label htmlFor="name">Name Your Search</Label>
-          <TextInput
-            required
-            id="name"
-            name="name"
-            type="text"
-            value={savedSearchValues.name}
-            onChange={onTextChange}
-          />
-          <p>When a new result is found:</p>
-          {/* <FormControlLabel
-                  control={
-                    <Checkbox
-                      // checked={gilad}
-                      // onChange={handleChange}
-                      name="email"
-                    />
-                  }
-                  label="Email me"
-                /> */}
-          <FormControlLabel
-            control={
-              <Checkbox
-                checked={savedSearchValues.createVulnerabilities}
-                onChange={(e) => onChange(e.target.name, e.target.checked)}
-                id="createVulnerabilities"
-                name="createVulnerabilities"
-              />
-            }
-            label="Create a vulnerability"
-          />
-          {savedSearchValues.createVulnerabilities && (
-            <>
-              <Label htmlFor="title">Title</Label>
-              <TextInput
-                required
-                id="title"
-                name="title"
-                type="text"
-                value={savedSearchValues.vulnerabilityTemplate.title}
-                onChange={onVulnerabilityTemplateChange}
-              />
-              <Label htmlFor="description">Description</Label>
-              <TextareaAutosize
-                required
-                id="description"
-                name="description"
-                style={{ padding: 10 }}
-                minRows={2}
-                value={savedSearchValues.vulnerabilityTemplate.description}
-                onChange={onVulnerabilityTemplateChange}
-              />
-              <Label htmlFor="description">Severity</Label>
-              <Dropdown
-                id="severity"
-                name="severity"
-                onChange={onVulnerabilityTemplateChange}
-                value={
-                  savedSearchValues.vulnerabilityTemplate.severity as string
-                }
-                style={{ display: 'inline-block', width: '150px' }}
-              >
-                <option value="None">None</option>
-                <option value="Low">Low</option>
-                <option value="Medium">Medium</option>
-                <option value="High">High</option>
-                <option value="Critical">Critical</option>
-              </Dropdown>
-            </>
-          )}
-          {/* <h3>Collaborators</h3>
-                <p>
-                  Collaborators can view vulnerabilities, and domains within
-                  this search. Adding a team will make all members
-                  collaborators.
-                </p>
-                <button className={classes.addButton} >
-                  <AddCircleOutline></AddCircleOutline> ADD
-                </button> */}
-        </FormGroup>
-        <ModalFooter>
-          <ButtonGroup>
-            <ModalToggleButton
-              modalRef={modalRef}
-              closer
-              onClick={async () => {
-                const body = {
-                  body: {
-                    ...savedSearchValues,
-                    searchTerm,
-                    filters,
-                    count: totalResults,
-                    searchPath: window.location.search,
-                    sortField,
-                    sortDirection
-                  }
-                };
-                if (search) {
-                  await apiPut('/saved-searches/' + search.id, body);
-                  history.push('/inventory');
-                  window.location.reload();
-                } else {
-                  await apiPost('/saved-searches/', body);
-                  history.push('/inventory');
-                  window.location.reload();
-                }
-              }}
-            >
-              Save
-            </ModalToggleButton>
-            <ModalToggleButton
-              modalRef={modalRef}
-              closer
-              unstyled
-              className="padding-105 text-center"
-            >
-              Cancel
-            </ModalToggleButton>
-          </ButtonGroup>
-        </ModalFooter>
-      </Modal>
-    </Root>
-  );
-};
-
-export const Dashboard = withSearch(
-  ({
-    addFilter,
-    removeFilter,
-    results,
-    totalResults,
-    filters,
-    facets,
-    searchTerm,
-    setSearchTerm,
-    autocompletedResults,
-    clearFilters,
-    saveSearch,
-    sortDirection,
-    sortField,
-    setSort,
-    resultsPerPage,
-    setResultsPerPage,
-    current,
-    setCurrent,
-    totalPages,
-    noResults
-  }: ContextType) => ({
-    addFilter,
-    removeFilter,
-    results,
-    totalResults,
-    filters,
-    facets,
-    searchTerm,
-    setSearchTerm,
-    autocompletedResults,
-    clearFilters,
-    saveSearch,
-    sortDirection,
-    sortField,
-    setSort,
-    resultsPerPage,
-    setResultsPerPage,
-    current,
-    setCurrent,
-    totalPages,
-    noResults
-  })
-)(DashboardUI);
diff --git a/frontend/src/pages/Search/DashboardPage.tsx b/frontend/src/pages/Search/DashboardPage.tsx
index eefaa30a..a9c17ec8 100644
--- a/frontend/src/pages/Search/DashboardPage.tsx
+++ b/frontend/src/pages/Search/DashboardPage.tsx
@@ -1 +1 @@
-export { Dashboard as SearchPage } from './Dashboard';
+export { Dashboard as SearchPage } from './Inventory';
diff --git a/frontend/src/pages/Search/FilterDrawer.tsx b/frontend/src/pages/Search/FilterDrawer.tsx
deleted file mode 100644
index 942f8372..00000000
--- a/frontend/src/pages/Search/FilterDrawer.tsx
+++ /dev/null
@@ -1,497 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import {
-  AccordionDetails,
-  Accordion as MuiAccordion,
-  AccordionSummary as MuiAccordionSummary,
-  IconButton,
-  Paper
-} from '@mui/material';
-import { DataGrid } from '@mui/x-data-grid';
-import { classes, StyledWrapper } from './Styling/filterDrawerStyle';
-import {
-  Delete,
-  ExpandMore,
-  FiberManualRecordRounded
-} from '@mui/icons-material';
-import { FaFilter } from 'react-icons/fa';
-import { SearchBar } from 'components';
-import { TaggedArrayInput, FacetFilter } from 'components';
-import { ContextType } from '../../context/SearchProvider';
-import { SavedSearch } from '../../types/saved-search';
-import { useAuthContext } from '../../context';
-import { useHistory, useLocation } from 'react-router-dom';
-import { withSearch } from '@elastic/react-search-ui';
-
-interface Props {
-  addFilter: ContextType['addFilter'];
-  removeFilter: ContextType['removeFilter'];
-  filters: ContextType['filters'];
-  facets: ContextType['facets'];
-  clearFilters: ContextType['clearFilters'];
-  updateSearchTerm: (term: string) => void;
-  searchTerm: ContextType['searchTerm'];
-  setSearchTerm: ContextType['setSearchTerm'];
-}
-
-const FiltersApplied: React.FC = () => {
-  return (
-    <div className={classes.applied}>
-      <FiberManualRecordRounded /> Filters Applied
-    </div>
-  );
-};
-
-const Accordion = MuiAccordion;
-const AccordionSummary = MuiAccordionSummary;
-
-export const FilterDrawer: React.FC<Props> = (props) => {
-  const {
-    filters,
-    addFilter,
-    removeFilter,
-    facets,
-    clearFilters,
-    searchTerm,
-    setSearchTerm
-  } = props;
-  const { apiGet, apiDelete } = useAuthContext();
-  const [savedSearches, setSavedSearches] = useState<SavedSearch[]>([]);
-  const [savedSearchCount, setSavedSearchCount] = useState(0);
-  const history = useHistory();
-  const location = useLocation();
-
-  useEffect(() => {
-    const fetchSearches = async () => {
-      try {
-        const response = await apiGet('/saved-searches');
-        setSavedSearches(response.result);
-        setSavedSearchCount(response.result.length);
-      } catch (error) {
-        console.error('Error fetching searches:', error);
-      }
-    };
-    fetchSearches();
-  }, [apiGet]);
-
-  const deleteSearch = async (id: string) => {
-    try {
-      await apiDelete(`/saved-searches/${id}`, { body: {} });
-      const updatedSearches = await apiGet('/saved-searches'); // Get current saved searches
-      setSavedSearches(updatedSearches.result); // Update the saved searches
-      setSavedSearchCount(updatedSearches.result.length); // Update the count
-    } catch (e) {
-      console.log(e);
-    }
-  };
-
-  const filtersByColumn = useMemo(
-    () =>
-      filters.reduce(
-        (allFilters, nextFilter) => ({
-          ...allFilters,
-          [nextFilter.field]: nextFilter.values
-        }),
-        {} as Record<string, string[]>
-      ),
-    [filters]
-  );
-
-  const portFacet: any[] = facets['services.port']
-    ? facets['services.port'][0].data
-    : [];
-
-  const fromDomainFacet: any[] = facets['fromRootDomain']
-    ? facets['fromRootDomain'][0].data
-    : [];
-
-  const cveFacet: any[] = facets['vulnerabilities.cve']
-    ? facets['vulnerabilities.cve'][0].data
-    : [];
-
-  const severityFacet: any[] = facets['vulnerabilities.severity']
-    ? facets['vulnerabilities.severity'][0].data
-    : [];
-
-  // Always show all severities
-  for (const value of ['Critical', 'High', 'Medium', 'Low']) {
-    if (!severityFacet.find((severity) => value === severity.value))
-      severityFacet.push({ value, count: 0 });
-  }
-
-  return (
-    <StyledWrapper style={{ overflowY: 'auto' }}>
-      <div className={classes.header}>
-        <SearchBar
-          initialValue={searchTerm}
-          value={searchTerm}
-          onChange={(value) => {
-            if (location.pathname !== '/inventory')
-              history.push('/inventory?q=' + value);
-            setSearchTerm(value, {
-              shouldClearFilters: false,
-              autocompleteResults: false
-            });
-          }}
-        />
-      </div>
-      <div className={classes.header}>
-        <div className={classes.filter}>
-          <FaFilter /> <h3>Filter</h3>
-        </div>
-        {clearFilters && (
-          <div>
-            <button onClick={clearFilters}>Clear All Filters</button>
-          </div>
-        )}
-      </div>
-      <Accordion
-        elevation={0}
-        square
-        classes={{
-          root: classes.root,
-          disabled: classes.disabled,
-          expanded: classes.expanded
-        }}
-      >
-        <AccordionSummary
-          expandIcon={<ExpandMore />}
-          classes={{
-            root: classes.root2,
-            content: classes.content,
-            disabled: classes.disabled2,
-            expanded: classes.expanded2
-          }}
-        >
-          <div>IP(s)</div>
-          {filtersByColumn['ip']?.length > 0 && <FiltersApplied />}
-        </AccordionSummary>
-        <AccordionDetails classes={{ root: classes.details }}>
-          <TaggedArrayInput
-            placeholder="IP address"
-            values={filtersByColumn.ip ?? []}
-            onAddTag={(value) => addFilter('ip', value, 'any')}
-            onRemoveTag={(value) => removeFilter('ip', value, 'any')}
-          />
-        </AccordionDetails>
-      </Accordion>
-      <Accordion
-        elevation={0}
-        square
-        classes={{
-          root: classes.root,
-          disabled: classes.disabled,
-          expanded: classes.expanded
-        }}
-      >
-        <AccordionSummary
-          expandIcon={<ExpandMore />}
-          classes={{
-            root: classes.root2,
-            content: classes.content,
-            disabled: classes.disabled2,
-            expanded: classes.expanded2
-          }}
-        >
-          <div>Domain(s)</div>
-          {filtersByColumn['name']?.length > 0 && <FiltersApplied />}
-        </AccordionSummary>
-        <AccordionDetails classes={{ root: classes.details }}>
-          <TaggedArrayInput
-            placeholder="Domain"
-            values={filtersByColumn.name ?? []}
-            onAddTag={(value) => addFilter('name', value, 'any')}
-            onRemoveTag={(value) => removeFilter('name', value, 'any')}
-          />
-        </AccordionDetails>
-      </Accordion>
-      {fromDomainFacet.length > 0 && (
-        <Accordion
-          elevation={0}
-          square
-          classes={{
-            root: classes.root,
-            disabled: classes.disabled,
-            expanded: classes.expanded
-          }}
-        >
-          <AccordionSummary
-            expandIcon={<ExpandMore />}
-            classes={{
-              root: classes.root2,
-              content: classes.content,
-              disabled: classes.disabled2,
-              expanded: classes.expanded2
-            }}
-          >
-            <div>Root Domain(s)</div>
-            {filtersByColumn['fromRootDomain']?.length > 0 && (
-              <FiltersApplied />
-            )}
-          </AccordionSummary>
-          <AccordionDetails classes={{ root: classes.details }}>
-            <FacetFilter
-              options={fromDomainFacet}
-              selected={filtersByColumn['fromRootDomain'] ?? []}
-              onSelect={(value) => addFilter('fromRootDomain', value, 'any')}
-              onDeselect={(value) =>
-                removeFilter('fromRootDomain', value, 'any')
-              }
-            />
-          </AccordionDetails>
-        </Accordion>
-      )}
-      {portFacet.length > 0 && (
-        <Accordion
-          elevation={0}
-          square
-          classes={{
-            root: classes.root,
-            disabled: classes.disabled,
-            expanded: classes.expanded
-          }}
-        >
-          <AccordionSummary
-            expandIcon={<ExpandMore />}
-            classes={{
-              root: classes.root2,
-              content: classes.content,
-              disabled: classes.disabled2,
-              expanded: classes.expanded2
-            }}
-          >
-            <div>Port(s)</div>
-            {filtersByColumn['services.port']?.length > 0 && <FiltersApplied />}
-          </AccordionSummary>
-          <AccordionDetails classes={{ root: classes.details }}>
-            <FacetFilter
-              options={portFacet}
-              selected={filtersByColumn['services.port'] ?? []}
-              onSelect={(value) => addFilter('services.port', value, 'any')}
-              onDeselect={(value) =>
-                removeFilter('services.port', value, 'any')
-              }
-            />
-          </AccordionDetails>
-        </Accordion>
-      )}
-      {cveFacet.length > 0 && (
-        <Accordion
-          elevation={0}
-          square
-          classes={{
-            root: classes.root,
-            disabled: classes.disabled,
-            expanded: classes.expanded
-          }}
-        >
-          <AccordionSummary
-            expandIcon={<ExpandMore />}
-            classes={{
-              root: classes.root2,
-              content: classes.content,
-              disabled: classes.disabled2,
-              expanded: classes.expanded2
-            }}
-          >
-            <div>CVE(s)</div>
-            {filtersByColumn['vulnerabilities.cve']?.length > 0 && (
-              <FiltersApplied />
-            )}
-          </AccordionSummary>
-          <AccordionDetails classes={{ root: classes.details }}>
-            <FacetFilter
-              options={cveFacet}
-              selected={filtersByColumn['vulnerabilities.cve'] ?? []}
-              onSelect={(value) =>
-                addFilter('vulnerabilities.cve', value, 'any')
-              }
-              onDeselect={(value) =>
-                removeFilter('vulnerabilities.cve', value, 'any')
-              }
-            />
-          </AccordionDetails>
-        </Accordion>
-      )}
-      {severityFacet.length > 0 && (
-        <Accordion
-          elevation={0}
-          square
-          classes={{
-            root: classes.root,
-            disabled: classes.disabled,
-            expanded: classes.expanded
-          }}
-        >
-          <AccordionSummary
-            expandIcon={<ExpandMore />}
-            classes={{
-              root: classes.root2,
-              content: classes.content,
-              disabled: classes.disabled2,
-              expanded: classes.expanded2
-            }}
-          >
-            <div>Severity</div>
-            {filtersByColumn['vulnerabilities.severity']?.length > 0 && (
-              <FiltersApplied />
-            )}
-          </AccordionSummary>
-          <AccordionDetails classes={{ root: classes.details }}>
-            <FacetFilter
-              options={severityFacet}
-              selected={filtersByColumn['vulnerabilities.severity'] ?? []}
-              onSelect={(value) =>
-                addFilter('vulnerabilities.severity', value, 'any')
-              }
-              onDeselect={(value) =>
-                removeFilter('vulnerabilities.severity', value, 'any')
-              }
-            />
-          </AccordionDetails>
-        </Accordion>
-      )}
-      <Accordion
-        elevation={0}
-        square
-        classes={{
-          root: classes.root,
-          disabled: classes.disabled,
-          expanded: classes.expanded
-        }}
-      >
-        <AccordionSummary
-          expandIcon={<ExpandMore />}
-          classes={{
-            root: classes.root2,
-            content: classes.content,
-            disabled: classes.disabled2,
-            expanded: classes.expanded2
-          }}
-        >
-          <div className={classes.header}>
-            <h3>Saved Searches</h3>
-          </div>
-        </AccordionSummary>
-        <Accordion style={{ overflowY: 'auto' }}>
-          <AccordionDetails classes={{ root: classes.details }}>
-            <Paper elevation={2} style={{ width: '15em' }}>
-              {savedSearches.length > 0 ? (
-                <DataGrid
-                  density="compact"
-                  key={'Data Grid'}
-                  rows={savedSearches.map((search) => ({ ...search }))}
-                  rowCount={savedSearchCount}
-                  columns={[
-                    {
-                      field: 'name',
-                      headerName: 'Name',
-                      flex: 1,
-                      width: 100,
-                      description: 'Name',
-                      renderCell: (cellValues) => {
-                        const applyFilter = () => {
-                          if (clearFilters) clearFilters();
-                          localStorage.setItem(
-                            'savedSearch',
-                            JSON.stringify(cellValues.row)
-                          );
-                          setSearchTerm(cellValues.row.searchTerm, {
-                            shouldClearFilters: false,
-                            autocompleteResults: false
-                          });
-                          if (location.pathname !== '/inventory')
-                            history.push(
-                              '/inventory?q=' + cellValues.row.searchTerm
-                            );
-
-                          // Apply the filters
-                          cellValues.row.filters.forEach((filter) => {
-                            filter.values.forEach((value) => {
-                              addFilter(filter.field, value, 'any');
-                            });
-                          });
-                        };
-                        return (
-                          <div
-                            aria-label={cellValues.row.name}
-                            title={`Saved Search: ${cellValues.row.name}`}
-                            tabIndex={0}
-                            onClick={applyFilter}
-                            onKeyDown={(e) => {
-                              if (e.key === 'Enter') {
-                                applyFilter();
-                              }
-                            }}
-                            style={{
-                              cursor: 'pointer',
-                              textAlign: 'left',
-                              width: '100%'
-                            }}
-                          >
-                            {cellValues.value}
-                          </div>
-                        );
-                      }
-                    },
-                    {
-                      field: 'actions',
-                      headerName: '',
-                      flex: 0.1,
-                      renderCell: (cellValues) => {
-                        const searchId = cellValues.id.toString();
-                        return (
-                          <div style={{ display: 'flexbox', textAlign: 'end' }}>
-                            <IconButton
-                              aria-label="Delete"
-                              title="Delete Search"
-                              onClick={(e) => {
-                                e.stopPropagation();
-                                deleteSearch(searchId);
-                              }}
-                              tabIndex={0}
-                              onKeyDown={(e) => {
-                                if (e.key === 'Enter') {
-                                  deleteSearch(searchId);
-                                }
-                              }}
-                            >
-                              <Delete />
-                            </IconButton>
-                          </div>
-                        );
-                      }
-                    }
-                  ]}
-                  initialState={{
-                    pagination: {
-                      paginationModel: {
-                        pageSize: 5
-                      }
-                    }
-                  }}
-                  pageSizeOptions={[5, 10]}
-                  disableRowSelectionOnClick
-                  sx={{
-                    disableColumnfilter: 'true',
-                    '& .MuiDataGrid-row:hover': {
-                      cursor: 'pointer'
-                    }
-                  }}
-                />
-              ) : (
-                <div>No Saved Searches</div>
-              )}
-            </Paper>
-          </AccordionDetails>
-        </Accordion>
-      </Accordion>
-    </StyledWrapper>
-  );
-};
-
-export const FilterDrawerWithSearch = withSearch(
-  ({ searchTerm, setSearchTerm }: ContextType) => ({
-    searchTerm,
-    setSearchTerm
-  })
-)(FilterDrawer);
diff --git a/frontend/src/pages/Search/FilterTags.tsx b/frontend/src/pages/Search/FilterTags.tsx
index a27eb03e..72afea18 100644
--- a/frontend/src/pages/Search/FilterTags.tsx
+++ b/frontend/src/pages/Search/FilterTags.tsx
@@ -15,9 +15,24 @@ interface FieldToLabelMap {
   [key: string]: {
     labelAccessor: (t: any) => any;
     filterValueAccssor: (t: any) => any;
+    trimAfter?: number;
   };
 }
 
+type EllipsisPastIndex<T> = (source: T[], index: number | null) => T[];
+
+const ellipsisPastIndex: EllipsisPastIndex<string> = (source, index) => {
+  const DEFAULT_INDEX = 3;
+  if (index === null || index === 0) {
+    return source.slice(0, DEFAULT_INDEX);
+  } else if (source.length > index + 1) {
+    const remainder = source.length - index - 1;
+    return [...source.slice(0, index + 1), `...+${remainder}`];
+  } else {
+    return source;
+  }
+};
+
 const FIELD_TO_LABEL_MAP: FieldToLabelMap = {
   'organization.regionId': {
     labelAccessor: (t) => {
@@ -25,6 +40,39 @@ const FIELD_TO_LABEL_MAP: FieldToLabelMap = {
     },
     filterValueAccssor: (t) => {
       return t;
+    },
+    trimAfter: 10
+  },
+  'vulnerabilities.severity': {
+    labelAccessor: (t) => {
+      return 'Severity';
+    },
+    filterValueAccssor(t) {
+      return t;
+    }
+  },
+  ip: {
+    labelAccessor: (t) => {
+      return 'IP';
+    },
+    filterValueAccssor(t) {
+      return t;
+    }
+  },
+  name: {
+    labelAccessor: (t) => {
+      return 'Name';
+    },
+    filterValueAccssor(t) {
+      return t;
+    }
+  },
+  fromRootDomain: {
+    labelAccessor: (t) => {
+      return 'Root Domain(s)';
+    },
+    filterValueAccssor(t) {
+      return t;
     }
   },
   organizationId: {
@@ -33,6 +81,15 @@ const FIELD_TO_LABEL_MAP: FieldToLabelMap = {
     },
     filterValueAccssor: (t) => {
       return t.name;
+    },
+    trimAfter: 2
+  },
+  query: {
+    labelAccessor: (t) => {
+      return 'Query';
+    },
+    filterValueAccssor(t) {
+      return t;
     }
   },
   'services.port': {
@@ -41,7 +98,8 @@ const FIELD_TO_LABEL_MAP: FieldToLabelMap = {
     },
     filterValueAccssor(t) {
       return t;
-    }
+    },
+    trimAfter: 6
   },
   'vulnerabilities.cve': {
     labelAccessor: (t) => {
@@ -49,13 +107,15 @@ const FIELD_TO_LABEL_MAP: FieldToLabelMap = {
     },
     filterValueAccssor(t) {
       return t;
-    }
+    },
+    trimAfter: 3
   }
 };
 
 type FlatFilters = {
   field: string;
   label: string;
+  onClear?: () => void;
   value: any;
   values: any[];
   type: 'all' | 'none' | 'any';
@@ -77,9 +137,12 @@ export const FilterTags: React.FC<Props> = ({ filters, removeFilter }) => {
     return filters.reduce((acc, nextFilter) => {
       const fieldAccessors = FIELD_TO_LABEL_MAP[nextFilter.field] ?? null;
       const value = fieldAccessors
-        ? nextFilter.values
-            .map((item: any) => fieldAccessors.filterValueAccssor(item))
-            .join(', ')
+        ? ellipsisPastIndex(
+            nextFilter.values.map((item: any) =>
+              fieldAccessors.filterValueAccssor(item)
+            ),
+            fieldAccessors.trimAfter ? fieldAccessors.trimAfter - 1 : null
+          ).join(', ')
         : nextFilter.values.join(', ');
       const label = fieldAccessors
         ? fieldAccessors.labelAccessor(nextFilter)
@@ -96,11 +159,7 @@ export const FilterTags: React.FC<Props> = ({ filters, removeFilter }) => {
   }, [filters]);
 
   return (
-    <Root
-      sx={{
-        marginTop: 1
-      }}
-    >
+    <Root>
       {filtersByColumn.map((filter, idx) => (
         <Chip
           key={idx}
@@ -113,6 +172,11 @@ export const FilterTags: React.FC<Props> = ({ filters, removeFilter }) => {
             </>
           }
           onDelete={() => {
+            if (filter.onClear) {
+              console.log('custom clear');
+              filter.onClear();
+              return;
+            }
             filter.values.forEach((val) => {
               removeFilter(filter.field, val, filter.type);
             });
diff --git a/frontend/src/pages/Search/Inventory.tsx b/frontend/src/pages/Search/Inventory.tsx
new file mode 100644
index 00000000..45dbeb4a
--- /dev/null
+++ b/frontend/src/pages/Search/Inventory.tsx
@@ -0,0 +1,280 @@
+import React, { useMemo, useState } from 'react';
+import { classes, Root } from './Styling/dashboardStyle';
+import { Subnav } from 'components';
+import { ResultCard } from './ResultCard';
+import {
+  Button,
+  Paper,
+  FormControl,
+  Select,
+  MenuItem,
+  Typography,
+  Box,
+  Stack
+} from '@mui/material';
+import { Pagination } from '@mui/material';
+import { withSearch } from '@elastic/react-search-ui';
+import { ContextType } from '../../context/SearchProvider';
+import { SortBar } from './SortBar';
+import { useAuthContext } from 'context';
+import { FilterTags } from './FilterTags';
+import { NoResults } from 'components/NoResults';
+import { exportCSV } from 'components/ImportExport';
+import { SaveSearchModal } from 'components/SaveSearchModal/SaveSearchModal';
+
+export const DashboardUI: React.FC<ContextType & { location: any }> = (
+  props
+) => {
+  const {
+    current,
+    setCurrent,
+    resultsPerPage,
+    setResultsPerPage,
+    filters,
+    removeFilter,
+    results,
+    sortDirection,
+    sortField,
+    setSort,
+    totalPages,
+    totalResults,
+    setSearchTerm,
+    searchTerm,
+    noResults
+  } = props;
+
+  const [selectedDomain, setSelectedDomain] = useState('');
+  const [resultsScrolled] = useState(false);
+  const { apiPost, setLoading, showAllOrganizations, currentOrganization } =
+    useAuthContext();
+
+  const advanceFiltersReq = filters.length > 1 || searchTerm !== ''; //Prevents a user from saving a search without advanced filters
+
+  const fetchDomainsExport = async (): Promise<string> => {
+    try {
+      const body: any = {
+        current,
+        filters,
+        resultsPerPage,
+        searchTerm,
+        sortDirection,
+        sortField
+      };
+      if (!showAllOrganizations && currentOrganization) {
+        if ('rootDomains' in currentOrganization)
+          body.organizationId = currentOrganization.id;
+        else body.tagId = currentOrganization.id;
+      }
+      const { url } = await apiPost('/search/export', {
+        body
+      });
+      return url!;
+    } catch (e) {
+      console.error(e);
+      return '';
+    }
+  };
+
+  const filtersToDisplay = useMemo(() => {
+    if (searchTerm !== '') {
+      return [
+        ...filters,
+        {
+          field: 'query',
+          values: [searchTerm],
+          onClear: () => setSearchTerm('', { shouldClearFilters: false })
+        }
+      ];
+    }
+    return filters;
+  }, [filters, searchTerm, setSearchTerm]);
+
+  return (
+    <Root className={classes.root}>
+      <Subnav
+        items={[
+          { title: 'Search Results', path: '/inventory', exact: true },
+          { title: 'All Domains', path: '/inventory/domains' },
+          { title: 'All Vulnerabilities', path: '/inventory/vulnerabilities' }
+        ]}
+        styles={{
+          paddingLeft: '0%'
+        }}
+      />
+      <Box
+        position="relative"
+        height="calc(100% - 32px - 32px - 46px - 10px)"
+        maxHeight="100%"
+        width="100%"
+        display="flex"
+        flexWrap="nowrap"
+        flexDirection="column"
+        alignItems="center"
+        justifyContent="center"
+      >
+        <Box width="90%" height="100%" display="flex" flexDirection="column">
+          <FilterTags filters={filtersToDisplay} removeFilter={removeFilter} />
+          <Stack
+            spacing={2}
+            direction="row"
+            alignItems="center"
+            justifyContent="space-between"
+          >
+            <SortBar
+              sortField={sortField}
+              sortDirection={sortDirection}
+              setSort={setSort}
+              isFixed={resultsScrolled}
+              advancedFiltersReq={advanceFiltersReq}
+            />
+            <SaveSearchModal
+              searchTerm={searchTerm}
+              filters={filters}
+              totalResults={totalResults}
+              sortField={''}
+              sortDirection={''}
+              advancedFiltersReq={advanceFiltersReq}
+            />
+          </Stack>
+          <Box
+            height="100%"
+            flexDirection="column"
+            flexWrap="nowrap"
+            gap="1rem"
+            alignItems="stretch"
+            display="flex"
+            position="relative"
+            padding="0 0 2rem 0"
+            sx={{ overflowY: 'auto' }}
+          >
+            {noResults ? (
+              <Box
+                display="flex"
+                flex="1"
+                alignItems="center"
+                justifyContent="center"
+                height="100%"
+              >
+                <NoResults
+                  message={"We don't see any results that match your criteria."}
+                ></NoResults>
+              </Box>
+            ) : (
+              results.map((result) => (
+                <ResultCard
+                  key={result.id.raw}
+                  {...result}
+                  onDomainSelected={(id) => setSelectedDomain(id)}
+                  selected={result.id.raw === selectedDomain}
+                />
+              ))
+            )}
+          </Box>
+        </Box>
+      </Box>
+      <Paper className={classes.pagination}>
+        <span>
+          <strong>
+            {(totalResults === 0
+              ? 0
+              : (current - 1) * resultsPerPage + 1
+            ).toLocaleString()}{' '}
+            -{' '}
+            {Math.min(
+              (current - 1) * resultsPerPage + resultsPerPage,
+              totalResults
+            ).toLocaleString()}
+          </strong>{' '}
+          of <strong>{totalResults.toLocaleString()}</strong>
+        </span>
+        <Pagination
+          count={totalPages}
+          page={current}
+          onChange={(_, page) => setCurrent(page)}
+          color="primary"
+          size="small"
+        />
+        <FormControl
+          variant="outlined"
+          className={classes.pageSize}
+          size="small"
+        >
+          <Typography id="results-per-page-label">Results per page:</Typography>
+          <Select
+            id="teststa"
+            labelId="results-per-page-label"
+            value={resultsPerPage}
+            onChange={(e) => setResultsPerPage(e.target.value as number)}
+          >
+            {[15, 45, 90].map((perPage) => (
+              <MenuItem key={perPage} value={perPage}>
+                {perPage}
+              </MenuItem>
+            ))}
+          </Select>
+        </FormControl>
+        <Button
+          variant="outlined"
+          className={classes.exportButton}
+          onClick={() =>
+            exportCSV(
+              {
+                name: 'domains',
+                getDataToExport: fetchDomainsExport
+              },
+              setLoading
+            )
+          }
+        >
+          Export Results
+        </Button>
+      </Paper>
+    </Root>
+  );
+};
+
+export const Dashboard = withSearch(
+  ({
+    addFilter,
+    removeFilter,
+    results,
+    totalResults,
+    filters,
+    facets,
+    searchTerm,
+    setSearchTerm,
+    autocompletedResults,
+    clearFilters,
+    saveSearch,
+    sortDirection,
+    sortField,
+    setSort,
+    resultsPerPage,
+    setResultsPerPage,
+    current,
+    setCurrent,
+    totalPages,
+    noResults
+  }: ContextType) => ({
+    addFilter,
+    removeFilter,
+    results,
+    totalResults,
+    filters,
+    facets,
+    searchTerm,
+    setSearchTerm,
+    autocompletedResults,
+    clearFilters,
+    saveSearch,
+    sortDirection,
+    sortField,
+    setSort,
+    resultsPerPage,
+    setResultsPerPage,
+    current,
+    setCurrent,
+    totalPages,
+    noResults
+  })
+)(DashboardUI);
diff --git a/frontend/src/pages/Search/SortBar.tsx b/frontend/src/pages/Search/SortBar.tsx
index 51c6d8af..2c6f4317 100644
--- a/frontend/src/pages/Search/SortBar.tsx
+++ b/frontend/src/pages/Search/SortBar.tsx
@@ -9,27 +9,18 @@ import {
 } from '@mui/material';
 import { ArrowUpward, ArrowDownward } from '@mui/icons-material';
 import { ContextType } from 'context/SearchProvider';
-import { SavedSearch } from 'types';
 
 interface Props {
   sortField: ContextType['sortField'];
   sortDirection?: ContextType['sortDirection'];
   setSort: ContextType['setSort'];
-  saveSearch?(): void;
   isFixed: boolean;
-  existingSavedSearch?: SavedSearch;
   children?: React.ReactNode;
+  advancedFiltersReq?: boolean;
 }
 
 export const SortBar: React.FC<Props> = (props) => {
-  const {
-    sortField,
-    sortDirection,
-    setSort,
-    saveSearch,
-    children,
-    existingSavedSearch
-  } = props;
+  const { sortField, sortDirection, setSort, children } = props;
 
   const toggleDirection = () => {
     setSort(sortField, sortDirection === 'asc' ? 'desc' : 'asc');
@@ -58,7 +49,6 @@ export const SortBar: React.FC<Props> = (props) => {
         <span id="sort-by-label">Sort by: </span>
         <FormControl className={classes.openFields}>
           <Select
-            disableUnderline
             labelId="sort-by-label"
             value={sortField}
             onChange={onSetSortField}
@@ -83,13 +73,6 @@ export const SortBar: React.FC<Props> = (props) => {
         </FormControl>
       </div>
       {children}
-      <div>
-        {saveSearch && (
-          <button onClick={saveSearch}>
-            {existingSavedSearch ? 'Update Saved Search' : 'Save Search'}
-          </button>
-        )}
-      </div>
     </Root>
   );
 };
diff --git a/frontend/src/pages/Search/Styling/filterTagsStyle.ts b/frontend/src/pages/Search/Styling/filterTagsStyle.ts
index 10df4ecb..b8d489b8 100644
--- a/frontend/src/pages/Search/Styling/filterTagsStyle.ts
+++ b/frontend/src/pages/Search/Styling/filterTagsStyle.ts
@@ -8,6 +8,7 @@ export const classes = {
 
 export const Root = styled('div')(({ theme }) => ({
   [`& .${classes.chip}`]: {
-    margin: '0 0.5rem'
+    marginTop: '0.5rem',
+    marginRight: '0.5rem'
   }
 }));
diff --git a/frontend/src/pages/Search/Styling/sortBarStyle.ts b/frontend/src/pages/Search/Styling/sortBarStyle.ts
index 5274c88c..84c02c6c 100644
--- a/frontend/src/pages/Search/Styling/sortBarStyle.ts
+++ b/frontend/src/pages/Search/Styling/sortBarStyle.ts
@@ -36,14 +36,6 @@ export const Root = styled('div')(({ theme }) => ({
     boxShadow: ({ isFixed }: Props) =>
       isFixed ? '0px 1px 2px rgba(0, 0, 0, 0.15)' : 'none',
     transition: 'box-shadow 0.3s linear',
-    '& button': {
-      outline: 'standard',
-      border: 'none',
-      color: '#4e4e4e',
-      background: 'none',
-      cursor: 'pointer',
-      textDecoration: 'underline'
-    },
     '& *:focus': {
       outline: 'standard'
     },
diff --git a/frontend/src/pages/TermsOfUse/TermsOfUse.tsx b/frontend/src/pages/TermsOfUse/TermsOfUse.tsx
index c29bc143..2bacc5c1 100644
--- a/frontend/src/pages/TermsOfUse/TermsOfUse.tsx
+++ b/frontend/src/pages/TermsOfUse/TermsOfUse.tsx
@@ -55,12 +55,7 @@ export const TermsOfUse: React.FC = () => {
         issues.
       </p>
       <p>
-        CyHy Dashboard supports two types of users for your organization:
-        administrative users or view-only users. Administrative users can
-        add/delete domains for their organization, schedule and disable scans
-        for their organization, and invite others to create CyHy Dashboard
-        accounts to have access to the organization’s data. View-only users can
-        only view data provided to or collected by CyHy Dashboard.
+        Users can only view data provided to or collected by CyHy Dashboard.
       </p>
       {maximumRole === 'admin' && (
         <p>
diff --git a/frontend/src/pages/TermsOfUse/__tests__/__snapshots__/termsOfUse.spec.tsx.snap b/frontend/src/pages/TermsOfUse/__tests__/__snapshots__/termsOfUse.spec.tsx.snap
index 5b1a72ec..b4dd9818 100644
--- a/frontend/src/pages/TermsOfUse/__tests__/__snapshots__/termsOfUse.spec.tsx.snap
+++ b/frontend/src/pages/TermsOfUse/__tests__/__snapshots__/termsOfUse.spec.tsx.snap
@@ -18,7 +18,7 @@ exports[`matches admin snapshot 1`] = `
         CyHy Dashboard is a free, self-service tool offered by the Department of Homeland Security’s Cybersecurity and Infrastructure Security Agency (CISA). Using both passive and active processes, CyHy Dashboard can continuously evaluate the cybersecurity posture of your public-facing, internet-accessible network assets for vulnerabilities or configuration issues.
       </p>
       <p>
-        CyHy Dashboard supports two types of users for your organization: administrative users or view-only users. Administrative users can add/delete domains for their organization, schedule and disable scans for their organization, and invite others to create CyHy Dashboard accounts to have access to the organization’s data. View-only users can only view data provided to or collected by CyHy Dashboard.
+        Users can only view data provided to or collected by CyHy Dashboard.
       </p>
       <p>
         Once you create a CyHy Dashboard administrator account, input the Internet Protocol (IP) addresses or domains to be continuously evaluated, and select the scanning/evaluation protocols to be used, CyHy Dashboard will collect data about the sites you specified from multiple publicly-available resources, including through active interactions with your sites, if that option is selected by you. CyHy Dashboard will also examine any publicly-available, internet-accessible resources that appear to be related or otherwise associated with IPs or domains you have provided us to evaluate, presenting you with a list of those related sites for your awareness.
@@ -137,7 +137,7 @@ exports[`matches user snapshot 1`] = `
         CyHy Dashboard is a free, self-service tool offered by the Department of Homeland Security’s Cybersecurity and Infrastructure Security Agency (CISA). Using both passive and active processes, CyHy Dashboard can continuously evaluate the cybersecurity posture of your public-facing, internet-accessible network assets for vulnerabilities or configuration issues.
       </p>
       <p>
-        CyHy Dashboard supports two types of users for your organization: administrative users or view-only users. Administrative users can add/delete domains for their organization, schedule and disable scans for their organization, and invite others to create CyHy Dashboard accounts to have access to the organization’s data. View-only users can only view data provided to or collected by CyHy Dashboard.
+        Users can only view data provided to or collected by CyHy Dashboard.
       </p>
       <p>
         By creating a CyHy Dashboard view only account and using this service, you request CISA’s technical assistance to detect vulnerabilities and configuration issues through CyHy Dashboard and agree to the following:
diff --git a/frontend/src/pages/Users/UserForm.tsx b/frontend/src/pages/Users/UserForm.tsx
index 827c207e..f85d4b30 100644
--- a/frontend/src/pages/Users/UserForm.tsx
+++ b/frontend/src/pages/Users/UserForm.tsx
@@ -118,7 +118,7 @@ export const UserForm: React.FC<UserFormProps> = ({
   };
 
   const validateForm = (values: UserFormValues) => {
-    const nameRegex = /^[A-Za-z\s]+$/;
+    const nameRegex = /^[A-Za-z\s-']+$/;
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     const newFormErrors = {
       firstName:
@@ -134,7 +134,7 @@ export const UserForm: React.FC<UserFormProps> = ({
   };
 
   const validateField = (name: string, value: string) => {
-    const nameRegex = /^[A-Za-z\s]+$/;
+    const nameRegex = /^[A-Za-z\s-']+$/;
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
     switch (name) {
       case 'firstName':
diff --git a/frontend/src/pages/Vulnerabilities/Vulnerabilities.tsx b/frontend/src/pages/Vulnerabilities/Vulnerabilities.tsx
index fe891262..b83a0f78 100644
--- a/frontend/src/pages/Vulnerabilities/Vulnerabilities.tsx
+++ b/frontend/src/pages/Vulnerabilities/Vulnerabilities.tsx
@@ -1,9 +1,8 @@
 import React, { useState, useCallback, useEffect } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
-import { Filters, SortingRule } from 'react-table';
 import { Query } from 'types';
 import { useAuthContext } from 'context';
-import { Vulnerability } from 'types';
+import { Vulnerability as VulnerabilityType } from 'types';
 import { Subnav } from 'components';
 import {
   Alert,
@@ -16,13 +15,19 @@ import {
   Stack,
   Typography
 } from '@mui/material';
-import { DataGrid, GridColDef, GridRenderCellParams } from '@mui/x-data-grid';
+import {
+  DataGrid,
+  GridColDef,
+  GridFilterItem,
+  GridRenderCellParams
+} from '@mui/x-data-grid';
 import CustomToolbar from 'components/DataGrid/CustomToolbar';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import { getSeverityColor } from 'pages/Risk/utils';
 import { differenceInCalendarDays, parseISO } from 'date-fns';
 import { truncateString } from 'utils/dataTransformUtils';
+import { ORGANIZATION_EXCLUSIONS } from 'hooks/useUserTypeFilters';
 
 export interface ApiResponse {
   result: Vulnerability[];
@@ -40,19 +45,29 @@ export const stateMap: { [key: string]: string } = {
   remediated: 'Remediated'
 };
 
-export interface VulnerabilityRow {
+export interface LooseVulnerabilityRow {
   id: string;
   title: string;
   severity: string;
   kev: string;
-  domain: string;
-  domainId: string;
+  domain: string | undefined;
+  domainId: string | undefined;
   product: string;
   createdAt: string;
   state: string;
 }
 
+type Nullable<T> = {
+  [P in keyof T]: T[P] | null;
+};
+
+type VulnerabilityRow = Nullable<LooseVulnerabilityRow>;
+
+type Vulnerability = Nullable<VulnerabilityType>;
+
 interface LocationState {
+  domain: any;
+  severity: string;
   title: string;
 }
 
@@ -62,13 +77,13 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
   children?: React.ReactNode;
   groupBy?: string;
 }) => {
-  const { currentOrganization, apiPost, apiPut, showAllOrganizations } =
-    useAuthContext();
+  const { currentOrganization, apiPost, apiPut } = useAuthContext();
   const [vulnerabilities, setVulnerabilities] = useState<Vulnerability[]>([]);
   const [totalResults, setTotalResults] = useState(0);
   const [loadingError, setLoadingError] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
-
+  // TO-DO
+  // Implement regional rollup for vulnerabilities view to allow for proper vunl drilldown from dashboard
   const updateVulnerability = useCallback(
     async (index: number, body: { [key: string]: string }) => {
       setIsLoading(true);
@@ -94,14 +109,12 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
   const vulnerabilitiesSearch = useCallback(
     async ({
       filters,
-      sort,
       page,
       pageSize = PAGE_SIZE,
       doExport = false,
       groupBy = undefined
     }: {
-      filters: Filters<Vulnerability>;
-      sort: SortingRule<Vulnerability>[];
+      filters: GridFilterItem[];
       page: number;
       pageSize?: number;
       doExport?: boolean;
@@ -115,7 +128,7 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
           .reduce(
             (accum, next) => ({
               ...accum,
-              [next.id]: next.value
+              [next.field]: next.value
             }),
             {}
           );
@@ -131,10 +144,14 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
             tableFilters['substate'] = substate.toLowerCase().replace(' ', '-');
           delete tableFilters['state'];
         }
-        if (!showAllOrganizations && currentOrganization) {
-          if ('rootDomains' in currentOrganization)
-            tableFilters['organization'] = currentOrganization.id;
-          else tableFilters['tag'] = currentOrganization.id;
+        let userOrgIsExcluded = false;
+        ORGANIZATION_EXCLUSIONS.forEach((exc) => {
+          if (currentOrganization?.name.toLowerCase().includes(exc)) {
+            userOrgIsExcluded = true;
+          }
+        });
+        if (currentOrganization && !userOrgIsExcluded) {
+          tableFilters['organization'] = currentOrganization.id;
         }
         if (tableFilters['isKev']) {
           // Convert string to boolean filter.
@@ -145,8 +162,6 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
           {
             body: {
               page,
-              sort: sort[0]?.id ?? 'createdAt',
-              order: sort[0]?.desc ? 'DESC' : 'ASC',
               filters: tableFilters,
               pageSize,
               groupBy
@@ -159,7 +174,7 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
         return;
       }
     },
-    [apiPost, currentOrganization, showAllOrganizations]
+    [apiPost, currentOrganization]
   );
 
   const fetchVulnerabilities = useCallback(
@@ -167,7 +182,6 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
       try {
         const resp = await vulnerabilitiesSearch({
           filters: query.filters,
-          sort: query.sort,
           page: query.page,
           pageSize: query.pageSize ?? PAGE_SIZE,
           groupBy
@@ -197,19 +211,50 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
   const history = useHistory();
   const location = useLocation();
   const state = location.state as LocationState;
-  const [initialFilters, setInitialFilters] = useState<Filters<Vulnerability>>(
-    state?.title ? [{ id: 'title', value: state.title }] : []
+  const [initialFilters, setInitialFilters] = useState<GridFilterItem[]>(
+    state?.title
+      ? [
+          {
+            field: 'title',
+            value: state.title,
+            operator: 'contains'
+          }
+        ]
+      : state?.domain
+      ? [
+          {
+            field: 'domain',
+            value: state.domain,
+            operator: 'contains'
+          }
+        ]
+      : state?.severity
+      ? [
+          {
+            field: 'severity',
+            value: state.severity,
+            operator: 'contains'
+          }
+        ]
+      : []
   );
-  const [filters, setFilters] = useState<Filters<Vulnerability>>([]);
+  const [filters, setFilters] = useState(initialFilters);
 
   const [paginationModel, setPaginationModel] = useState({
     page: 0,
     pageSize: PAGE_SIZE,
     pageCount: 0,
-    sort: [],
-    filters: initialFilters ? initialFilters : filters
+    filters: filters
   });
 
+  const [filterModel, setFilterModel] = useState({
+    items: filters.map((filter) => ({
+      id: filter.id,
+      field: filter.field,
+      value: filter.value,
+      operator: filter.operator
+    }))
+  });
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
 
   const resetVulnerabilities = useCallback(() => {
@@ -217,7 +262,6 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
     fetchVulnerabilities({
       page: 1,
       pageSize: PAGE_SIZE,
-      sort: [],
       filters: []
     });
   }, [fetchVulnerabilities]);
@@ -227,7 +271,6 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
     fetchVulnerabilities({
       page: 1,
       pageSize: PAGE_SIZE,
-      sort: [],
       filters: initialFilters
     });
   }, [fetchVulnerabilities, initialFilters]);
@@ -237,13 +280,19 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
     title: vuln.title,
     severity: vuln.severity ?? 'N/A',
     kev: vuln.isKev ? 'Yes' : 'No',
-    domain: vuln.domain.name,
-    domainId: vuln.domain.id,
-    product: vuln.cpe ?? 'N/A',
-    createdAt: `${differenceInCalendarDays(
-      Date.now(),
-      parseISO(vuln.createdAt)
-    )} days`,
+    domain: vuln?.domain?.name,
+    domainId: vuln?.domain?.id,
+    product: vuln.cpe
+      ? vuln.cpe
+      : vuln?.service?.products
+      ? vuln?.service.products[0].cpe || 'N/A'
+      : 'N/A',
+    createdAt: vuln?.createdAt
+      ? `${differenceInCalendarDays(
+          Date.now(),
+          parseISO(vuln?.createdAt)
+        )} days`
+      : '',
     state: vuln.state + (vuln.substate ? ` (${vuln.substate})` : '')
   }));
 
@@ -456,18 +505,6 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
         ]}
       ></Subnav>
       <br></br>
-      {initialFilters.length > 0 && (
-        <Box mt={3} display="flex" justifyContent="center">
-          <Paper elevation={2} sx={{ width: '90%', px: 1 }}>
-            <Typography>
-              Displaying {state.title} vulnerabilities.{' '}
-              <Button onClick={resetVulnerabilities}>
-                Reset Vulnerabilities
-              </Button>
-            </Typography>
-          </Paper>
-        </Box>
-      )}
       <Box mb={3} mt={3} display="flex" justifyContent="center">
         {isLoading ? (
           <Paper elevation={2}>
@@ -500,21 +537,26 @@ export const Vulnerabilities: React.FC<{ groupBy?: string }> = ({
                 fetchVulnerabilities({
                   page: model.page + 1,
                   pageSize: model.pageSize,
-                  sort: paginationModel.sort,
                   filters: paginationModel.filters
                 });
               }}
               filterMode="server"
+              filterModel={filterModel}
               onFilterModelChange={(model) => {
                 const filters = model.items.map((item) => ({
-                  id: item.field,
-                  value: item.value
+                  id: item.id,
+                  field: item.field,
+                  value: item.value,
+                  operator: item.operator
                 }));
                 setFilters(filters);
+                setFilterModel((prevFilterModel) => ({
+                  ...prevFilterModel,
+                  items: filters
+                }));
                 fetchVulnerabilities({
                   page: paginationModel.page + 1,
                   pageSize: paginationModel.pageSize,
-                  sort: paginationModel.sort,
                   filters: filters
                 });
               }}
diff --git a/frontend/src/pages/Vulnerability/CveSection.tsx b/frontend/src/pages/Vulnerability/CveSection.tsx
index 0f434f11..f8dd3ff5 100644
--- a/frontend/src/pages/Vulnerability/CveSection.tsx
+++ b/frontend/src/pages/Vulnerability/CveSection.tsx
@@ -18,6 +18,7 @@ import {
   Cpe as ProductInfoType,
   Vulnerability as VulnerabilityType
 } from 'types';
+import nvd from '../../assets/nvd.jpeg';
 
 interface GroupedByVendor {
   [key: string]: ProductInfoType[];
@@ -70,7 +71,7 @@ export const CveSection: React.FC<HasCVEProps> = ({
               component="img"
               sx={{ height: 25, width: 30 }}
               alt="NVD"
-              src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ5dvAqUgpcwQXcfmDxrMry2Z6mj8FAckqcjpbHupW7ReLf_DuyhR8_jIYcr8hs38yDorw&usqp=CAU"
+              src={nvd}
             />
             <Typography
               display="inline"
@@ -133,7 +134,7 @@ export const CveSection: React.FC<HasCVEProps> = ({
               component="img"
               sx={{ height: 25, width: 30 }}
               alt="NVD"
-              src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ5dvAqUgpcwQXcfmDxrMry2Z6mj8FAckqcjpbHupW7ReLf_DuyhR8_jIYcr8hs38yDorw&usqp=CAU"
+              src={nvd}
             />
             <Typography
               display="inline"
diff --git a/frontend/src/pages/Vulnerability/Vulnerability.tsx b/frontend/src/pages/Vulnerability/Vulnerability.tsx
index 059aedcc..a5ccaab0 100644
--- a/frontend/src/pages/Vulnerability/Vulnerability.tsx
+++ b/frontend/src/pages/Vulnerability/Vulnerability.tsx
@@ -247,7 +247,8 @@ export const Vulnerability: React.FC = () => {
                         ) + ' day(s) ago' || 'N/A'}
                       </TableCell>
                     </TableRow>
-                    <TableRow>
+                    {/* To-Do: Add back in once an IP Address geolocation service is available. */}
+                    {/* <TableRow>
                       <TableCell component="th" scope="row">
                         Country:
                       </TableCell>
@@ -256,7 +257,7 @@ export const Vulnerability: React.FC = () => {
                           ? vulnerability.domain.country
                           : 'N/A'}
                       </TableCell>
-                    </TableRow>
+                    </TableRow> */}
                     <TableRow>
                       <TableCell component="th" scope="row">
                         Organization:
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 0e585e1e..b5539049 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -1,4 +1,3 @@
-import { SortingRule, Filters } from 'react-table';
 export * from './cpe';
 export * from './cve';
 export * from './domain';
@@ -6,16 +5,10 @@ export * from './vulnerability';
 export * from './scan';
 export * from './organization';
 export * from './user';
+export * from './query';
 export * from './role';
 export * from './scan-task';
 export * from './saved-search';
 export * from './stats';
 export * from './report';
 export * from './notification';
-
-export interface Query<T extends object> {
-  sort: SortingRule<T>[];
-  page: number;
-  filters: Filters<T>;
-  pageSize?: number;
-}
diff --git a/frontend/src/types/org-query.ts b/frontend/src/types/org-query.ts
new file mode 100644
index 00000000..6719d915
--- /dev/null
+++ b/frontend/src/types/org-query.ts
@@ -0,0 +1,8 @@
+import { SortingRule, Filters } from 'react-table';
+
+export interface OrgQuery<T extends object> {
+  sort: SortingRule<T>[];
+  page: number;
+  filters: Filters<T>;
+  pageSize?: number;
+}
diff --git a/frontend/src/types/query.ts b/frontend/src/types/query.ts
new file mode 100644
index 00000000..f8bba514
--- /dev/null
+++ b/frontend/src/types/query.ts
@@ -0,0 +1,11 @@
+import { GridFilterItem } from '@mui/x-data-grid';
+
+export interface CustomGridFilterItem<T> extends GridFilterItem {
+  customProperty?: T;
+}
+
+export interface Query<T extends object> {
+  page: number;
+  filters: CustomGridFilterItem<T>[];
+  pageSize?: number;
+}
diff --git a/frontend/src/types/saved-search.ts b/frontend/src/types/saved-search.ts
index 74177cb2..14444f7a 100644
--- a/frontend/src/types/saved-search.ts
+++ b/frontend/src/types/saved-search.ts
@@ -1,5 +1,4 @@
 import { User } from './user';
-import { Vulnerability } from './vulnerability';
 
 export interface SavedSearch {
   id: string;
@@ -13,6 +12,4 @@ export interface SavedSearch {
   searchPath: string;
   sortField: string;
   sortDirection: string;
-  createVulnerabilities: boolean;
-  vulnerabilityTemplate: Partial<Vulnerability>;
 }