diff --git a/app/components/filters/drink.filter.tsx b/app/components/filters/drink.filter.tsx
index 1bc4369..7c7f7b6 100644
--- a/app/components/filters/drink.filter.tsx
+++ b/app/components/filters/drink.filter.tsx
@@ -69,10 +69,10 @@ function DrinkFilter(arg : Arguments) {
                   ["name", "Name"],
                   ["new", "New"],
                   ["popular", "Popularity"],
-                  ["abv-asc", "ABV Low -> High"],
-                  ["abv-desc", "ABV High -> Low"],
-                  ["inv-asc", "Inventoy Low -> High"],
-                  ["inv-desc", "Inventory High -> Low"]
+                  ["abv-asc", "Alcohol (Low -> High)"],
+                  ["abv-desc", "Alcohol (High -> Low)"],
+                  ["inv-asc", "Inventory (Low -> High)"],
+                  ["inv-desc", "Inventory (High -> Low)"]
                 ].map((pair) => (
                     <Form.Check
                       id={"sort-" + pair[0]}
@@ -86,7 +86,7 @@ function DrinkFilter(arg : Arguments) {
               
             </Form.Group>
             <Form.Group controlId="drink-type" className='bg-body-secondary rounded p-3 mt-3'>
-              <Form.Label className='fw-bold'>Drink type</Form.Label>
+              <Form.Label className='fw-bold'>Drink Type</Form.Label>
               { ["Beer", "Wine", "Soda", "Cocktail"].map(key => (
                   <Form.Check
                     id={"drink-" + key}
@@ -100,8 +100,8 @@ function DrinkFilter(arg : Arguments) {
               
             </Form.Group>
             <Form.Group controlId="drink-abv" className='bg-body-secondary rounded p-3 mt-3'>
-              <Form.Label className='fw-bold'>ABV</Form.Label>
-              <div className='d-grid gap-2'>{abvOptionsMarkup}</div>
+              <Form.Label className='fw-bold'>Alcohol Percentage</Form.Label>
+              <div className='d-grid'>{abvOptionsMarkup}</div>
             </Form.Group>
             {/* <Form.Group controlId="manufacturer" className='bg-body-secondary rounded p-3 mt-3'>
               <Form.Label className='fw-bold'>Manufacturer</Form.Label>
diff --git a/app/routes/admin/manage/inventory.tsx b/app/routes/admin/manage/inventory.tsx
index 385ed95..2288c79 100644
--- a/app/routes/admin/manage/inventory.tsx
+++ b/app/routes/admin/manage/inventory.tsx
@@ -1,8 +1,10 @@
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
 import { json } from "@remix-run/node";
+import { useMemo, useState } from "react";
 import { useLoaderData } from "@remix-run/react";
 import { Button, Form } from "react-bootstrap";
 import { containerTypeToString } from "~/models/types";
+import { volume } from '~/utils/conversions';
 
 import { enhance } from "~/utils/db.server";
 
@@ -12,7 +14,7 @@ export async function loader({
   }: LoaderFunctionArgs) {
     const { dbe } = await enhance(request);
   
-    const containers = await dbe.container.findMany({select: {id: true, drink: true, type: true, inventory: true}, orderBy: {drink: {name: "asc"}}});
+    const containers = await dbe.container.findMany({select: {id: true, drink: true, type: true, inventory: true, volume: true}, orderBy: {drink: {name: "asc"}}});
 
     return json({ containers });
   };
@@ -44,16 +46,37 @@ export async function action({
 
 export default function EditInventoryRoute() {
     const lData = useLoaderData<typeof loader>();
+    const [search, setSearch] = useState("");
+
+    const filteredContainers = useMemo(() => {
+      const searchText = search.trim().toLowerCase();
+      if (!searchText) return lData.containers;
+
+      return lData.containers.filter((container) => {
+        const label = `${container.drink.name} ${containerTypeToString(container.type)} ${container.inventory}`.toLowerCase();
+        return label.includes(searchText);
+      });
+    }, [lData.containers, search]);
 
     return (
       <div>
         <h2>Update inventory</h2>
         <Form method="post">
+            <Form.Group className='mb-2'>
+                <Form.Label>Filter containers</Form.Label>
+                <Form.Control
+                  type="search"
+                  value={search}
+                  onChange={(event) => setSearch(event.currentTarget.value)}
+                  placeholder="Type drink name, type or inventory"
+                  autoComplete="off"
+                />
+            </Form.Group>
             <Form.Group className='mb-2'>
                 <Form.Label>Drink container</Form.Label>
                 <Form.Select name="id">
-                    { lData.containers.map((container) => (
-                        <option value={container.id}>{container.drink.name} - {containerTypeToString(container.type)} ({container.inventory})</option>
+                    { filteredContainers.map((container) => (
+                        <option key={container.id} value={container.id}>{container.drink.name} - {containerTypeToString(container.type)} - {volume(container.volume)} ({container.inventory})</option>
                     ))}
                 </Form.Select>
             </Form.Group>
diff --git a/app/routes/scan/route.tsx b/app/routes/scan/route.tsx
index 599247f..fa1244a 100644
--- a/app/routes/scan/route.tsx
+++ b/app/routes/scan/route.tsx
@@ -1,6 +1,7 @@
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/node";
 import { json, redirect } from "@remix-run/node";
 import { useActionData, useLoaderData } from "@remix-run/react";
+import { useEffect, useRef, useState } from "react";
 import { Col, Container, Form, Row, Table } from "react-bootstrap";
 import timeAgo from "~/utils/datetime";
 
@@ -27,9 +28,13 @@ export async function action({
   const form = await request.formData();
   const barcode = form.get("barcode")?.toString() || "";
 
-  const container = await dbe.container.findUnique({ 
-      select: {id: true, inventory: true, drink_id: true}, 
-      where: {barcode: barcode}
+  const container = await dbe.container.findUnique({
+      select: {
+        id: true,
+        inventory: true,
+        drink: { select: { name: true, image: true } },
+      },
+      where: { barcode: barcode },
   });
   
   // No drink found for barcode, do nothing
@@ -48,58 +53,138 @@ export async function action({
   // Log entry
   await dbe.history.create({data: {container: {connect: {id: container.id}}, inventoryAfter: newInventory}});
 
-  return json({error: ""});
+  return json({
+    error: "",
+    lastScanned: {
+      name: container.drink.name,
+      image: container.drink.image ?? null,
+    },
+  });
 };
 
 export default function ScanRoute() {
     const aData = useActionData<typeof action>();
     const lData = useLoaderData<typeof loader>();
 
+    const [lastScanned, setLastScanned] = useState<{name:string;image:string|null} | null>(null);
+    const [showLastScanned, setShowLastScanned] = useState(false);
+    const inputRef = useRef<HTMLInputElement>(null);
+
     const hasError = aData?.error ? aData.error.length > 0 : false;
 
+    const focusInput = () => {
+      window.setTimeout(() => inputRef.current?.focus(), 0);
+    };
+
+    useEffect(() => {
+      focusInput();
+    }, []);
+
+    useEffect(() => {
+      focusInput();
+    }, [aData]);
+
+    useEffect(() => {
+      const handleBlur = () => {
+        focusInput();
+      };
+
+      const input = inputRef.current;
+      input?.addEventListener("blur", handleBlur);
+
+      return () => {
+        input?.removeEventListener("blur", handleBlur);
+      };
+    }, []);
+
+    useEffect(() => {
+      if (!aData?.lastScanned) {
+        return;
+      }
+
+      setLastScanned(aData.lastScanned);
+      setShowLastScanned(true);
+
+      const timer = window.setTimeout(() => {
+        setShowLastScanned(false);
+      }, 5000);
+
+      return () => window.clearTimeout(timer);
+    }, [aData?.lastScanned]);
+
     return (
-      <Container>
-          <Row className="mt-3">
-            <Col xs={4}>
-              <Form method="post" action="/scan?index" noValidate>
-                <Form.Group>
-                  <Form.Label>
-                      Scan barcode:
-                  </Form.Label>
-                  <Form.Control
-                      type="text"
-                      name="barcode"
-                      isInvalid={hasError}
-                      autoFocus
-                  />
-                  <Form.Control.Feedback type="invalid">
-                    {aData?.error}
-                  </Form.Control.Feedback>
-                </Form.Group>
-              </Form>
-            </Col>
-          </Row>
-          <Row className="mt-3">
-            <Col xs={12}>
+      <Container fluid className="mt-3">
+          <Row>
+            <Col xs={12} md={6} className="mb-3">
               <h3>History</h3>
-              <Table striped>
-                <thead>
-                  <tr>
-                    <th>Drink</th>
-                    <th>When</th>
-                    <th>Amount left</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {lData.history.map((entry) => (
-                  <tr key={entry.id}>
-                    <td>{entry.container.drink.name}</td>
-                    <td>{timeAgo(new Date(entry.checkoutAt))}</td>
-                    <td>{entry.inventoryAfter}</td>
-                  </tr>
-                  ))}
-                </tbody>
-              </Table>
+              <div style={{ maxHeight: '70vh', overflowY: 'auto' }}>
+                <Table striped size="sm">
+                  <thead>
+                    <tr>
+                      <th>Drink</th>
+                      <th>When</th>
+                      <th>Amount left</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {lData.history.map((entry) => (
+                    <tr key={entry.id}>
+                      <td>{entry.container.drink.name}</td>
+                      <td>{timeAgo(new Date(entry.checkoutAt))}</td>
+                      <td>{entry.inventoryAfter}</td>
+                    </tr>
+                    ))}
+                  </tbody>
+                </Table>
+              </div>
+            </Col>
+            <Col xs={12} md={6}>
+              <h3>Scan Barcode</h3>
+              <Row className="mb-3">
+                <Col>
+                  <Form method="post" action="/scan?index" noValidate>
+                    <Form.Group>
+                      <Form.Control
+                          ref={inputRef}
+                          type="text"
+                          name="barcode"
+                          isInvalid={hasError}
+                          autoComplete="off"
+                          spellCheck={false}
+                          inputMode="text"
+                          style={{ height: '3rem', fontSize: '1.8rem', textAlign: 'center' }}
+                      />
+                      <Form.Control.Feedback type="invalid">
+                        {aData?.error}
+                      </Form.Control.Feedback>
+                    </Form.Group>
+                  </Form>
+                </Col>
+              </Row>
+              <Row>
+                <Col>
+                  <div className="p-4 border rounded" style={{ minHeight: '50vh', display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', textAlign: 'center' }}>
+                    {showLastScanned && lastScanned ? (
+                      <>
+                        <h1 style={{ fontSize: '2rem', marginBottom: '1rem' }}>{lastScanned.name}</h1>
+                        {lastScanned.image ? (
+                          <img
+                            src={lastScanned.image}
+                            alt={lastScanned.name}
+                            style={{ width: '100%', maxHeight: '40vh', objectFit: 'contain' }}
+                          />
+                        ) : (
+                          <div className="text-muted" style={{ fontSize: '1.5rem' }}>No image available</div>
+                        )}
+                      </>
+                    ) : (
+                      <div className="text-muted" style={{ fontSize: '2rem', fontWeight: 600 }}>
+                        <h1>Please scan your drink</h1>
+                      </div>
+                    )}
+                  </div>
+                </Col>
+              </Row>
             </Col>
           </Row>
         </Container>