diff --git a/src/Admin.js b/src/Admin.js
index e28dc65..03e3599 100644
--- a/src/Admin.js
+++ b/src/Admin.js
@@ -2,13 +2,15 @@ import React, { useEffect, useState } from "react";
 import firebase from "firebase/app";
 import { Stack } from "@mui/system";
 import { CheckboxListSecondary } from "./index";
+import { useParams } from "react-router-dom";
 
 export const Admin = () => {
   const [messaggi, cambiaMessaggi] = useState([]);
+  const { evento } = useParams();
 
   useEffect(() => {
     // Get a reference to the messages node in the Realtime Database
-    var messagesRef = firebase.database().ref("/messaggi");
+    var messagesRef = firebase.database().ref(`/messaggi/${evento}`);
     console.log(messagesRef);
 
     messagesRef.on("value", function (snapshot) {
@@ -34,7 +36,7 @@ export const Admin = () => {
         onChecked={(m) => {
           firebase
             .database()
-            .ref("messaggi/" + m.id)
+            .ref(`/messaggi/${evento}/` + m.id)
             .update({
               approvato: !m.approvato,
             });
diff --git a/src/ImageUpload.js b/src/ImageUpload.js
index 47b9f4e..3f249fb 100644
--- a/src/ImageUpload.js
+++ b/src/ImageUpload.js
@@ -23,7 +23,10 @@ function ImageUpload({ onImageURLSet }) {
       const uploadTask = firebase
         .storage()
         .ref(`images/${image.name}`)
-        .put(image);
+        .put(image, {
+          cacheControl: "public,max-age=3000000",
+          contentType: "image/jpeg",
+        });
 
       setState(UPLOADING);
 
@@ -68,7 +71,6 @@ function ImageUpload({ onImageURLSet }) {
             multiple
             type="file"
             accept="image/*"
-            capture="camera"
             onChange={handleChange}
           />
           <label htmlFor="raised-button-file">
diff --git a/src/index.js b/src/index.js
index db7c7a2..4de4cb6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -49,9 +49,10 @@ export function CheckboxListSecondary({ messaggi, onChecked }) {
               }}
             />
 
-            <p
-              style={{ maxWidth: 200, width: 200 }}
-            >{`"${m.testo}" da ${m.autore}`}</p>
+            <p style={{ maxWidth: 200, width: 200 }}>
+              {`"${m.testo}"`}
+              {m.autore && <span>da {m.autore}</span>}
+            </p>
             <IconButton
               variant="outlined"
               onClick={() => {