diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 00000000..d6da906e
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,31 @@
+# Build stage
+FROM node:18-alpine AS builder
+
+WORKDIR /app
+
+# Copy package files
+COPY package*.json ./
+
+# Install dependencies
+RUN npm ci
+
+# Copy source code
+COPY . .
+
+# Build the application
+RUN npm run build
+
+# Production stage
+FROM nginx:alpine
+
+# Copy built assets from builder stage
+COPY --from=builder /app/dist /usr/share/nginx/html
+
+# Copy nginx configuration
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# Expose port 80
+EXPOSE 80
+
+# Start nginx
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/frontend/nginx.conf b/frontend/nginx.conf
new file mode 100644
index 00000000..b954ae62
--- /dev/null
+++ b/frontend/nginx.conf
@@ -0,0 +1,56 @@
+server {
+    listen 80;
+    server_name localhost;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # Enable gzip compression
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 1024;
+    gzip_types text/plain text/css text/xml text/javascript application/javascript application/xml+rss application/json;
+
+    # Security headers
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+
+    # API proxy configuration
+    location /api/ {
+        proxy_pass http://api:8000/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_cache_bypass $http_upgrade;
+
+        # Increase timeouts for large file uploads
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+
+        # Increase max body size for file uploads (100MB)
+        client_max_body_size 100M;
+    }
+
+    # SPA fallback - serve index.html for all routes
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    # Cache static assets
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+        expires 1y;
+        add_header Cache-Control "public, immutable";
+    }
+
+    # Don't cache index.html
+    location = /index.html {
+        expires -1;
+        add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+    }
+}
diff --git a/frontend/src/components/ComparisonOffers/ComparisonOffersDialog.tsx b/frontend/src/components/ComparisonOffers/ComparisonOffersDialog.tsx
index e6744c2b..e29c5bd5 100644
--- a/frontend/src/components/ComparisonOffers/ComparisonOffersDialog.tsx
+++ b/frontend/src/components/ComparisonOffers/ComparisonOffersDialog.tsx
@@ -36,8 +36,6 @@ import {
   StarBorder,
 } from "@mui/icons-material";
 import Radio from "@mui/material/Radio";
-import RadioGroup from "@mui/material/RadioGroup";
-import Tooltip from "@mui/material/Tooltip";
 import { useApplicationStore } from "../../store/applicationStore";
 
 interface ComparisonOffer {
@@ -748,7 +746,9 @@ const ComparisonOffersDialog: React.FC<ComparisonOffersDialogProps> = ({
                         }
                         error={
                           (!newOffer.url && !newOffer.attachment_id) ||
-                          (newOffer.url !== "" && !newOffer.url.includes("."))
+                          (!!newOffer.url &&
+                            newOffer.url !== "" &&
+                            !newOffer.url.includes("."))
                         }
                       />
                       <FormControl size="small" fullWidth>
diff --git a/frontend/src/components/ComparisonOffers/CostPositionsList.tsx b/frontend/src/components/ComparisonOffers/CostPositionsList.tsx
index 420192fa..1d09ffd3 100644
--- a/frontend/src/components/ComparisonOffers/CostPositionsList.tsx
+++ b/frontend/src/components/ComparisonOffers/CostPositionsList.tsx
@@ -6,7 +6,6 @@ import {
   ListItemSecondaryAction,
   Box,
   Typography,
-  Tooltip,
   CircularProgress,
   Button,
 } from "@mui/material";
@@ -14,7 +13,6 @@ import {
   Warning,
   CheckCircle,
   Receipt,
-  Info,
   DoNotDisturb,
 } from "@mui/icons-material";
 import ComparisonOffersDialog from "./ComparisonOffersDialog";
@@ -180,7 +178,6 @@ const CostPositionsList: React.FC<CostPositionsListProps> = ({
           .filter(({ cost }) => cost.name && cost.amountEur > 0)
           .map(({ cost, originalIndex }) => {
             const status = getPositionStatus(originalIndex);
-            const needsAttention = status === "incomplete" && !loading;
 
             return (
               <ListItem
diff --git a/frontend/src/pages/AdminApplicationView.tsx b/frontend/src/pages/AdminApplicationView.tsx
index 6883c890..fd75bbce 100644
--- a/frontend/src/pages/AdminApplicationView.tsx
+++ b/frontend/src/pages/AdminApplicationView.tsx
@@ -67,6 +67,7 @@ const AdminApplicationView: React.FC = () => {
     downloadApplicationPdfAdmin,
     resetApplicationCredentials,
     isAdmin,
+    masterKey,
   } = useApplicationStore();
 
   // Local state