diff --git a/src/app/admin/manage/order/[[...orderId]]/page.tsx b/src/app/admin/manage/order/[[...orderId]]/page.tsx
index a802ca5..3d2206f 100644
--- a/src/app/admin/manage/order/[[...orderId]]/page.tsx
+++ b/src/app/admin/manage/order/[[...orderId]]/page.tsx
@@ -115,6 +115,33 @@ const Page = ({ params }: { params: { orderId: string } }) => {
             .catch(error => setError(error.message));
     }
 
+    const setOrderAsPaid = (_id: string, isPaid: boolean) => {
+        fetch(`/api/order/${_id}/pay`, {
+            method: 'PUT',
+            headers: headers,
+            body: JSON.stringify({ isPaid: isPaid })
+        })
+            .then(async response => {
+                const data = await response.json();
+                if (!response.ok) {
+                    const error = (data && data.message) || response.statusText;
+                    throw new Error(error);
+                }
+                return data;
+            })
+            .then(() => {
+                // Update the order by id
+                const newOrders = orders.map((order: OrderDocument) => {
+                    if (order._id === _id) {
+                        order.isPaid = isPaid;
+                    }
+                    return order;
+                });
+                setOrders(newOrders);
+            })
+            .catch(error => setError(error.message));
+    }
+
     /**
      * Function to convert barcode to order
      * @param barcode
@@ -217,7 +244,7 @@ const Page = ({ params }: { params: { orderId: string } }) => {
                                             <span className="text-sm font-medium text-gray-800">{food.name}</span>
                                             <div className="flex gap-1 mt-1">
                                                 {food.dietary && <span
-                                                        className="px-2 py-0.5 text-xs font-semibold text-white bg-blue-500 rounded-full">{food.dietary}</span>}
+																									className="px-2 py-0.5 text-xs font-semibold text-white bg-blue-500 rounded-full">{food.dietary}</span>}
                                                 <span
                                                     className="px-2 py-0.5 text-xs font-semibold text-white bg-green-500 rounded-full">{food.type}</span>
                                             </div>
@@ -238,6 +265,14 @@ const Page = ({ params }: { params: { orderId: string } }) => {
                                         {state}
                                     </button>
                                 ))}
+                                <button
+                                    className={`rounded-full px-4 py-2 text-sm font-medium transition duration-200 
+    ${order.isPaid ? 'bg-green-300 text-green-700 hover:bg-green-400' : 'bg-red-300 text-red-700 hover:bg-red-400'} 
+    focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-50 disabled:cursor-not-allowed`}
+                                    onClick={() => setOrderAsPaid(order._id, !order.isPaid)}
+                                >
+                                    {order.isPaid ? 'Paid' : 'Not Paid'}
+                                </button>
                             </div>
                         </div>
                     ))}
diff --git a/src/app/admin/prepare/page.jsx b/src/app/admin/prepare/page.jsx
index 45db27e..1d2b01e 100644
--- a/src/app/admin/prepare/page.jsx
+++ b/src/app/admin/prepare/page.jsx
@@ -3,8 +3,7 @@
 import {useEffect, useState} from "react";
 import {getFromLocalStorage} from "@/lib/localStorage";
 import ErrorMessage from "@/app/components/ErrorMessage.jsx";
-import {getDateFromTimeSlot} from "@/lib/time";
-import {formatDateTime} from "@/lib/time";
+import {formatDateTime, getDateFromTimeSlot} from "@/lib/time";
 import WithAuth from "../WithAuth.jsx";
 
 const getHeaders = () => {
@@ -98,6 +97,9 @@ const Page = () => {
 			newOrders[orderIndex] = newOrder;
 			setOrders(newOrders);
 		},
+		undone: (_id) => {
+			updateOrderStatus(_id, 'pending')
+		},
 		done: (_id) => {
 			updateOrderStatus(_id, 'baking')
 		},
@@ -127,17 +129,17 @@ const Page = () => {
 								<div key={activeOrderId + index} className="bg-white rounded-lg shadow-sm p-2">
 									<div className="mb-2">
 										<div className="flex justify-between items-center">
-											<div className="flex space-x-2">
+											<div className="flex space-x-2 flex-wrap">
 										    <span
-											    className="inline-flex items-center px-2.5 py-0.5 rounded-full text-sm font-medium bg-gray-100 text-gray-800">
+											    className="inline-flex items-center px-2.5 py-0.5 m-0.5 rounded-full text-sm font-medium bg-gray-100 text-gray-800">
 											    {order._id}
 										    </span>
 												<span
-													className="inline-flex items-center px-2.5 py-0.5 rounded-full text-sm font-medium bg-gray-100 text-gray-800">
+													className="inline-flex items-center px-2.5 py-0.5 m-0.5 rounded-full text-sm font-medium bg-gray-100 text-gray-800">
 										      {order.name}
 										    </span>
 												<span
-													className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-sm font-medium text-gray-800
+													className={`inline-flex items-center px-2.5 py-0.5 m-0.5 rounded-full text-sm font-medium text-gray-800
 												    ${order.status === 'pending' ? 'bg-yellow-100' : ''}
 												    ${order.status === 'paid' ? 'bg-orange-100' : ''}
 												    ${order.status === 'baking' ? 'bg-green-100' : ''}`}>
@@ -182,6 +184,10 @@ const Page = () => {
 										<button onClick={() => actions.cancel(order._id)}
 										        className="px-2 py-1 text-xs rounded border border-gray-300 hover:bg-gray-100">Cancel
 										</button>
+										<button onClick={() => actions.undone(order._id)}
+										        disabled={order.status === 'pending'}
+										        className="px-2 py-1 text-xs rounded border border-gray-300 hover:bg-gray-100 disabled:opacity-50">Undone
+										</button>
 										<button onClick={() => actions.done(order._id)}
 										        disabled={order.items.some(item => item.status !== 'done')}
 										        className="px-2 py-1 text-xs rounded border border-gray-300 hover:bg-gray-100 disabled:opacity-50">Done
diff --git a/src/app/api/manage/db/prepare/route.ts b/src/app/api/manage/db/prepare/route.ts
index 0cfcbf5..8996d8f 100644
--- a/src/app/api/manage/db/prepare/route.ts
+++ b/src/app/api/manage/db/prepare/route.ts
@@ -42,25 +42,25 @@ export async function POST() {
 
     // Add pizzas
     const pizzas = [
-        { name: 'Salami half', price: 4, type: 'pizza', ingredients: pizza_by_name('Salami'), },
-        { name: 'Salami full', price: 8, type: 'pizza', ingredients: pizza_by_name('Salami'), },
-        { name: 'Ham and mushrooms half', price: 4, type: 'pizza', ingredients: pizza_by_name('Ham and mushrooms'), },
-        { name: 'Ham and mushrooms full', price: 8, type: 'pizza', ingredients: pizza_by_name('Ham and mushrooms'), },
-        { name: 'Capriccosa half', price: 4, type: 'pizza', ingredients: pizza_by_name('Capriccosa'), },
-        { name: 'Capriccosa full', price: 8, type: 'pizza', ingredients: pizza_by_name('Capriccosa'), },
-        { name: 'Margherita half', price: 3, dietary: 'vegetarian', type: 'pizza', ingredients: pizza_by_name('Margherita'), },
-        { name: 'Margherita full', price: 6, dietary: 'vegetarian', type: 'pizza', ingredients: pizza_by_name('Margherita'), },
-        { name: 'Veggies half', price: 3, dietary: 'vegetarian', type: 'pizza', ingredients: pizza_by_name('Veggies'), },
-        { name: 'Veggies full', price: 6, dietary: 'vegetarian', type: 'pizza', ingredients: pizza_by_name('Veggies'), },
-        { name: 'Margherita vegan half', price: 3, dietary: 'vegan', type: 'pizza', ingredients: pizza_by_name('Margherita vegan'), },
-        { name: 'Margherita vegan full', price: 6, dietary: 'vegan', type: 'pizza', ingredients: pizza_by_name('Margherita vegan'), },
-        { name: 'Capriccosa vegan half', price: 3, dietary: 'vegan', type: 'pizza', ingredients: pizza_by_name('Capriccosa vegan'), },
-        { name: 'Capriccosa vegan full', price: 6, dietary: 'vegan', type: 'pizza', ingredients: pizza_by_name('Capriccosa vegan'), },
+        { name: 'Salami half', price: 4, type: 'pizza', ingredients: pizza_by_name('Salami'), size: 0.5 },
+        { name: 'Salami full', price: 8, type: 'pizza', ingredients: pizza_by_name('Salami'), size: 1 },
+        { name: 'Ham and mushrooms half', price: 4, type: 'pizza', ingredients: pizza_by_name('Ham and mushrooms'), size: 0.5 },
+        { name: 'Ham and mushrooms full', price: 8, type: 'pizza', ingredients: pizza_by_name('Ham and mushrooms'), size: 1 },
+        { name: 'Capriccosa half', price: 4, type: 'pizza', ingredients: pizza_by_name('Capriccosa'), size: 0.5 },
+        { name: 'Capriccosa full', price: 8, type: 'pizza', ingredients: pizza_by_name('Capriccosa'), size: 1 },
+        { name: 'Margherita half', price: 3, dietary: 'vegetarian', type: 'pizza', ingredients: pizza_by_name('Margherita'), size: 0.5 },
+        { name: 'Margherita full', price: 6, dietary: 'vegetarian', type: 'pizza', ingredients: pizza_by_name('Margherita'), size: 1 },
+        { name: 'Veggies half', price: 3, dietary: 'vegetarian', type: 'pizza', ingredients: pizza_by_name('Veggies'), size: 0.5 },
+        { name: 'Veggies full', price: 6, dietary: 'vegetarian', type: 'pizza', ingredients: pizza_by_name('Veggies'), size: 1 },
+        { name: 'Margherita vegan half', price: 3, dietary: 'vegan', type: 'pizza', ingredients: pizza_by_name('Margherita vegan'), size: 0.5 },
+        { name: 'Margherita vegan full', price: 6, dietary: 'vegan', type: 'pizza', ingredients: pizza_by_name('Margherita vegan'), size: 1 },
+        { name: 'Capriccosa vegan half', price: 3, dietary: 'vegan', type: 'pizza', ingredients: pizza_by_name('Capriccosa vegan'), size: 0.5 },
+        { name: 'Capriccosa vegan full', price: 6, dietary: 'vegan', type: 'pizza', ingredients: pizza_by_name('Capriccosa vegan'), size: 1 },
     ];
     for (const pizza of pizzas) {
         await new Food(pizza).save();
     }
-    
+
     // Add the system
     const system = new System({ name: constants.SYSTEM_NAME, status: 'active' })
     await system.save()
diff --git a/src/app/api/order/[id]/cancel/route.ts b/src/app/api/order/[id]/cancel/route.ts
index daf288c..d5c1a8f 100644
--- a/src/app/api/order/[id]/cancel/route.ts
+++ b/src/app/api/order/[id]/cancel/route.ts
@@ -35,6 +35,7 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
 
         // Check if the order is already delivered or ready
         if (['delivered', 'ready'].includes(foundOrder.status)) {
+            console.log('Order was already cancelled:', foundOrder.status)
             return new Response(`Order was already ${foundOrder.status}. Cannot cancel!`, { status: 400 });
         }
 
@@ -47,7 +48,7 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
         // console.log('Order updated:', foundOrder)
         return Response.json(foundOrder);
     } catch (error) {
-        console.error('Error setting order as paid:', error);
-        return new Response('Error setting order as paid', { status: 500 });
+        console.error('Error cancel order:', error);
+        return new Response('Error cancel order', { status: 500 });
     }
 }
diff --git a/src/app/api/order/[id]/pay/route.ts b/src/app/api/order/[id]/pay/route.ts
new file mode 100644
index 0000000..7057532
--- /dev/null
+++ b/src/app/api/order/[id]/pay/route.ts
@@ -0,0 +1,89 @@
+import mongoose from "mongoose";
+import dbConnect from "@/lib/dbConnect";
+import { headers } from "next/headers";
+import { extractBearerFromHeaders, validateToken } from "@/lib/auth";
+import { Order } from "@/model/order";
+import { NextResponse } from "next/server";
+
+/**
+ * Retrieve whether order is paid or not
+ * @param req
+ * @param params
+ * @constructor
+ */
+export async function GET(req: Request, { params }: { params: { id: string } }) {
+    await dbConnect();
+
+    // Get the ID from the URL
+    const id = params.id
+
+    // Check if the ID is valid and ObjectId
+    if (!id || !mongoose.isValidObjectId(id)) {
+        return NextResponse.json({
+            message: 'The ID is not valid.'
+        }, { status: 400 })
+    }
+
+    // Find the order by ID
+    const order = await Order.findById(id);
+    if (!order) {
+        return NextResponse.json({
+            message: 'The Order was not found.'
+        }, { status: 404 })
+    }
+
+    return Response.json({
+        isPaid: order.isPaid
+    })
+}
+
+/**
+ * Set order as paid
+ * @param req
+ * @param params
+ * @constructor
+ */
+export async function PUT(req: Request, { params }: { params: { id: string } }) {
+    await dbConnect();
+
+    // Authenticate the user
+    const headersList = headers()
+    if (!await validateToken(extractBearerFromHeaders(headersList))) {
+        return new Response('Unauthorized', { status: 401 });
+    }
+
+    // Get the order details from the request body
+    const id = params.id
+    const { isPaid } = await req.json()
+
+    // Check if the ID is valid and ObjectId
+    if (!id || !mongoose.isValidObjectId(id)) {
+        return NextResponse.json({
+            message: 'The ID is not valid.'
+        }, { status: 400 })
+    }
+
+
+    try {
+        // Find the order by ID
+        const foundOrder = await Order.findById(id);
+
+        if (!foundOrder) {
+            return NextResponse.json({
+                message: 'The Order was not found.'
+            }, { status: 404 })
+        }
+
+        // Update the order status
+        foundOrder.isPaid = isPaid
+
+        // Save the updated order
+        await foundOrder.save();
+
+        // console.log('Order updated:', foundOrder)
+        return Response.json(foundOrder);
+    } catch (error) {
+        console.error(`Error setting order as paid`)
+        return new Response(`Error setting order as paid`, { status: 500 });
+    }
+}
diff --git a/src/app/api/order/[id]/route.ts b/src/app/api/order/[id]/route.ts
index 527aa1d..e4f1ffc 100644
--- a/src/app/api/order/[id]/route.ts
+++ b/src/app/api/order/[id]/route.ts
@@ -1,10 +1,9 @@
 import dbConnect from "@/lib/dbConnect";
-
-import moment from 'moment-timezone';
 import mongoose from "mongoose";
 import { Order } from "@/model/order";
 import { Food, FoodDocument } from "@/model/food";
 import { constants } from "@/config";
+import moment from "moment-timezone";
 
 
 export async function GET(req: Request, { params }: { params: { id: string } }) {
@@ -68,6 +67,7 @@ export async function GET(req: Request, { params }: { params: { id: string } })
         totalPrice: order.totalPrice,
         finishedAt: moment(order.finishedAt).tz(constants.TIMEZONE_ORDERS).format(),
         status: order.status,
+        isPaid: order.isPaid
     }
 
     // Send the order
diff --git a/src/app/api/order/route.ts b/src/app/api/order/route.ts
index 6bf28e4..6ec5f57 100644
--- a/src/app/api/order/route.ts
+++ b/src/app/api/order/route.ts
@@ -52,7 +52,8 @@ export async function GET(req: Request) {
             timeslot: order.timeslot, // new Date(order.orderDate.getTime() + totalTime),
             totalPrice: order.totalPrice,
             finishedAt: order.finishedAt,
-            status: order.status
+            status: order.status,
+            isPaid: order.isPaid
         }
     }))
 
diff --git a/src/app/components/layout/Header.jsx b/src/app/components/layout/Header.jsx
index 6f08331..e7e9af7 100644
--- a/src/app/components/layout/Header.jsx
+++ b/src/app/components/layout/Header.jsx
@@ -18,7 +18,7 @@ const Header = () => {
 	}, []);
 
 	const adminLinks = [
-		{to: "/admin/preparing", text: "Prepare Foods"}, //does not work yet
+		{to: "/admin/prepare", text: "Prepare Foods"}, //does not work yet
 		{to: "/admin/manage", text: "Manage DB"},
 		{to: "/admin/manage/order", text: "Manage Orders"},
 		{to: "/admin/manage/pizza", text: "Manage Foods"},
diff --git a/src/app/order/[orderNumber]/page.tsx b/src/app/order/[orderNumber]/page.tsx
index 9a50ea1..6987ad8 100755
--- a/src/app/order/[orderNumber]/page.tsx
+++ b/src/app/order/[orderNumber]/page.tsx
@@ -5,10 +5,10 @@ import OrderQR from "@/app/components/order/OrderQR.jsx";
 import { useRouter } from "next/navigation";
 import { getFromLocalStorage } from "@/lib/localStorage";
 import { formatDateTime, getDateFromTimeSlot } from "@/lib/time";
-import { statusToText } from "@/model/order";
 
 
 const Page = ({ params }: { params: { orderNumber: string } }) => {
+    const [error, setError] = useState(null);
     const [order, setOrder] = useState({} as any);
 
     // Check if logged in
@@ -24,7 +24,7 @@ const Page = ({ params }: { params: { orderNumber: string } }) => {
     useEffect(() => {
         // Get the order status from the server
         fetch(`/api/order/${params.orderNumber}`)
-            .            then(async response => {
+            .then(async response => {
                 const data = await response.json();
                 if (!response.ok) {
                     const error = (data && data.message) || response.statusText;
@@ -50,14 +50,31 @@ const Page = ({ params }: { params: { orderNumber: string } }) => {
         });
     }
 
-	const hasComment = () => {
-		return (
-			typeof order.comment === "string" &&
-			order.comment != "" &&
-			order.comment.toLowerCase() !== "No comment".toLowerCase()
-		);
-	}
+    const hasComment = () => {
+        return (
+            typeof order.comment === "string" &&
+            order.comment != "" &&
+            order.comment.toLowerCase() !== "No comment".toLowerCase()
+        );
+    }
 
+    const statusToText = (order: { status: string, isPaid: boolean }) => {
+        let statusText
+        if (order.status === 'ready') {
+            statusText = 'Your order is ready for pickup! 🎉';
+        } else if (order.status === 'pending') {
+            statusText = 'Please pay at the counter.';
+        } else if (order.status === 'baking') {
+            statusText = 'Your pizza is in the oven. Its getting hot 🔥';
+        } else if (order.status === 'delivered') {
+            statusText = 'Your order has been delivered.';
+        } else if (order.status === 'cancelled') {
+            statusText = 'Your order has been cancelled. 😢';
+        } else {
+            statusText = 'Unknown order.';
+        }
+        return statusText
+    }
 
     return (
         <div>
@@ -73,29 +90,29 @@ const Page = ({ params }: { params: { orderNumber: string } }) => {
                     <OrderQR orderId={params.orderNumber}/>
 
                     <p className="mb-3 text-lg font-light text-gray-600 leading-7">
-                        {statusToText(order.status)}
+                        {statusToText(order)}
                     </p>
                 </div>
                 <div className="">
                     <div className="ml-4">
                         <h3 className="text-lg font-bold">Order details</h3>
-						{hasComment() && (
-							<div className="list-disc list-inside text-sm font-light text-gray-600 mb-4">
-								<div className="flex flex-col">
-									<span className="font-bold">Comment:</span>
-									<span className="pl-4 italic">{order.comment}</span>
-								</div>
-							</div>
-						)}
+                        {hasComment() && (
+                            <div className="list-disc list-inside text-sm font-light text-gray-600 mb-4">
+                                <div className="flex flex-col">
+                                    <span className="font-bold">Comment:</span>
+                                    <span className="pl-4 italic">{order.comment}</span>
+                                </div>
+                            </div>
+                        )}
                         <ul className="list-disc list-inside text-sm font-light text-gray-600 mb-4">
                             {order && order.items && order.items.map((food: any) => (
                                 <li key={food.name}>{food.name}: {food.price}€</li>
                             ))}
                         </ul>
-                        <p className="text-lg font-light text-gray-600">
+                        <p className={`font-light text-gray-600 ${order.isPaid ? 'text-green-600' : 'text-red-600'}`}>
                             Total: {order && order.items && order.items.reduce((total: number, food: {
                             price: number
-                        }) => total + food.price, 0)}€
+                        }) => total + food.price, 0)}€ {order.isPaid ? '(Paid)' : '(Not paid)'}
                         </p>
                         <p className="text-lg font-light text-gray-600">
                             Order date: {formatDateTime(new Date(order.orderDate))}
@@ -104,10 +121,10 @@ const Page = ({ params }: { params: { orderNumber: string } }) => {
                             Timeslot: {formatDateTime(getDateFromTimeSlot(order.timeslot).toDate())}
                         </p>
                         {order.status !== 'cancelled' &&
-													<button className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded mt-4"
-													        onClick={cancelOrder}>
-														Cancel order
-													</button>}
+					                <button className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded mt-4"
+					                        onClick={cancelOrder}>
+						                Cancel order
+					                </button>}
                     </div>
                 </div>
             </div>
diff --git a/src/app/page.jsx b/src/app/page.jsx
index 01afaba..12a9dc2 100644
--- a/src/app/page.jsx
+++ b/src/app/page.jsx
@@ -160,10 +160,10 @@ const Page = () => {
 
 	/**
 	 * Set the name of the order
-	 * @param e
+	 * @param name
 	 */
-	const setName = (e) => {
-		updateOrder({name: e.target.value});
+	const setName = (name) => {
+		updateOrder({name: name});
 	};
 
 	/**
diff --git a/src/model/order.ts b/src/model/order.ts
index b71ee9c..069eddd 100644
--- a/src/model/order.ts
+++ b/src/model/order.ts
@@ -1,29 +1,10 @@
 import { type Document, Model, model, Schema } from "mongoose";
 import { FoodDocument } from "./food";
-import { ORDER } from "@/config";
 
-export type OrderStatus = 'pending' | 'paid' | 'baking' | 'ready' | 'delivered' | 'cancelled';
-export const ORDER_STATES: OrderStatus[] = ['pending', 'paid', 'baking', 'ready', 'delivered', 'cancelled'];
+export type OrderStatus = 'pending' | 'baking' | 'ready' | 'delivered' | 'cancelled';
+export const ORDER_STATES: OrderStatus[] = ['pending', 'baking', 'ready', 'delivered', 'cancelled'];
 
 
-export const statusToText = (status: string) => {
-    if (status === 'ready') {
-        return 'Your order is ready for pickup!';
-    } else if (status === 'pending') {
-        return 'Please pay at the counter.';
-    } else if (status === 'baking') {
-        return 'Its getting hot 🔥:)';
-    } else if (status === 'paid') {
-        return 'Your order is being prepared...';
-    } else if (status === 'delivered') {
-        return 'Your order has been delivered!';
-    } else if (status === 'cancelled') {
-        return 'Your order has been cancelled.';
-    } else {
-        return 'Unknown status';
-    }
-}
-
 export interface OrderDocument extends Document {
     _id: string;
     name: string;
@@ -33,6 +14,7 @@ export interface OrderDocument extends Document {
     timeslot: string;
     totalPrice: number;
     finishedAt?: Date;
+    isPaid: boolean;
     status: OrderStatus;
 }
 
@@ -68,6 +50,10 @@ const orderSchema = new Schema<OrderDocument>({
     finishedAt: {
         type: Date,
     },
+    isPaid: {
+        type: Boolean,
+        default: false,
+    },
     status: {
         type: String,
         enum: ORDER_STATES,