diff --git a/smart-hut/public/img/room_404_meme/1.jpeg b/smart-hut/public/img/room_404_meme/1.jpeg
new file mode 100644
index 0000000..b039f37
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/1.jpeg differ
diff --git a/smart-hut/public/img/room_404_meme/10.jpg b/smart-hut/public/img/room_404_meme/10.jpg
new file mode 100644
index 0000000..d1b2abd
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/10.jpg differ
diff --git a/smart-hut/public/img/room_404_meme/11.jpeg b/smart-hut/public/img/room_404_meme/11.jpeg
new file mode 100644
index 0000000..0675dac
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/11.jpeg differ
diff --git a/smart-hut/public/img/room_404_meme/12.gif b/smart-hut/public/img/room_404_meme/12.gif
new file mode 100644
index 0000000..575dbac
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/12.gif differ
diff --git a/smart-hut/public/img/room_404_meme/13.gif b/smart-hut/public/img/room_404_meme/13.gif
new file mode 100644
index 0000000..94b389c
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/13.gif differ
diff --git a/smart-hut/public/img/room_404_meme/14.gif b/smart-hut/public/img/room_404_meme/14.gif
new file mode 100644
index 0000000..575599e
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/14.gif differ
diff --git a/smart-hut/public/img/room_404_meme/2.jpeg b/smart-hut/public/img/room_404_meme/2.jpeg
new file mode 100644
index 0000000..eb71f0b
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/2.jpeg differ
diff --git a/smart-hut/public/img/room_404_meme/3.png b/smart-hut/public/img/room_404_meme/3.png
new file mode 100644
index 0000000..8c2b210
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/3.png differ
diff --git a/smart-hut/public/img/room_404_meme/4.jpeg b/smart-hut/public/img/room_404_meme/4.jpeg
new file mode 100644
index 0000000..413c5f3
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/4.jpeg differ
diff --git a/smart-hut/public/img/room_404_meme/5.jpeg b/smart-hut/public/img/room_404_meme/5.jpeg
new file mode 100644
index 0000000..294fcb4
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/5.jpeg differ
diff --git a/smart-hut/public/img/room_404_meme/6.jpg b/smart-hut/public/img/room_404_meme/6.jpg
new file mode 100644
index 0000000..e830719
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/6.jpg differ
diff --git a/smart-hut/public/img/room_404_meme/7.jpg b/smart-hut/public/img/room_404_meme/7.jpg
new file mode 100644
index 0000000..358bec2
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/7.jpg differ
diff --git a/smart-hut/public/img/room_404_meme/8.jpg b/smart-hut/public/img/room_404_meme/8.jpg
new file mode 100644
index 0000000..0f63a46
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/8.jpg differ
diff --git a/smart-hut/public/img/room_404_meme/9.jpeg b/smart-hut/public/img/room_404_meme/9.jpeg
new file mode 100644
index 0000000..db5935a
Binary files /dev/null and b/smart-hut/public/img/room_404_meme/9.jpeg differ
diff --git a/smart-hut/src/components/modalform.js b/smart-hut/src/components/modalform.js
index 3400d42..d54daff 100644
--- a/smart-hut/src/components/modalform.js
+++ b/smart-hut/src/components/modalform.js
@@ -7,7 +7,8 @@ export default class ModalWindow extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedIcon: 'home',
+      id : "",
+      selectedIcon: "",
       name: "",
       img: "",
       openModal: false
@@ -23,14 +24,26 @@ export default class ModalWindow extends Component {
       "name" : this.state.name,
       "images" : this.state.img
     }
-
-    console.log(this.props, data);
     this.props.addRoom(data);
     this.closeModal();
   }
 
+  modifyRoomModal = (e) => {
+    let data = {
+      "icon" : this.state.selectedIcon,
+      "name" : this.state.name,
+      "images" : this.state.img
+    }
+    this.props.updateRoom(data);
+    this.closeModal();
+  }
+
   deleteRoom = (e) => {
-    console.log(e);
+    let data = {
+      "id" : this.state.id
+    }
+    this.props.deleteRoom(data);
+    this.closeModal();
   }
 
   changeSomething = (event) => {
@@ -49,7 +62,6 @@ export default class ModalWindow extends Component {
    }
 
   updateIcon(e) {
-    console.log(e);
     this.setState({selectedIcon : e})
   }
 
@@ -64,10 +76,16 @@ export default class ModalWindow extends Component {
 
       return (
         <div>
+
+        {this.props.type == "new" ?
         <Button icon labelPosition='left' inverted onClick={this.openModal}>
           <Icon name='plus' size='small'/>
           ADD ROOM
         </Button>
+         :
+         <Icon name="pencil" size="small" onClick={this.openModal}/>
+        }
+
         <Modal
         onClose={this.closeModal}
         open={this.state.openModal}>
@@ -76,16 +94,19 @@ export default class ModalWindow extends Component {
           <Form>
           <p>Insert the name of the room:</p>
             <Form.Field>
-              <Input label='Room name' placeholder='Room Name' name="name" type='text' onChange={this.changeSomething}/>
+              <Input label='Room name' placeholder='Room Name' name="name" type='text' onChange={this.changeSomething}
+              value={this.props.type == "new" ? null : this.props.idRoom.name }/>
             </Form.Field>
             <p>Insert an image of the room:</p>
             <Form.Field>
-              <Input label='Room image' type='file' name="img" onChange={this.changeSomething}/>
+              <Input label='Room image' type='file' name="img" onChange={this.changeSomething}
+              value={this.props.type == "new" ? null : this.props.idRoom.images }/>
             </Form.Field>
           </Form>
 
           <div style={spaceDiv}>
           <p>Select an icon:</p>
+          {this.props.selectedIcon == "new" ? "home" : this.props.idRoom.icon }
           <SelectIcons updateIcon={this.updateIcon} currentIcon={this.state.selectedIcon}/>
           </div>
 
@@ -100,9 +121,12 @@ export default class ModalWindow extends Component {
           <Button color='red' onClick={this.closeModal}>
             <Icon name='remove' /> {this.props.type == "new" ? "Cancel" : "Discard changes" }
           </Button>
-          <Button color='green' onClick={this.addRoomModal}>
-            <Icon name='checkmark' /> {this.props.type == "new" ? "Add room" : "Save changes" }
+
+
+          <Button color='green' onClick={this.props.type == "new" ? this.addRoomModal : this.modifyRoomModal}>
+            <Icon name='checkmark' /> {this.props.type == "new" ? "Add room" : "Save changes"}
           </Button>
+
         </Modal.Actions>
           </Modal>
         </div>
diff --git a/smart-hut/src/views/Navbar.js b/smart-hut/src/views/Navbar.js
index c887f59..36e25a7 100644
--- a/smart-hut/src/views/Navbar.js
+++ b/smart-hut/src/views/Navbar.js
@@ -8,17 +8,14 @@ class Navbar extends Component {
     super(props);
     this.state = {
       activeItem: 'Home',
-      edited: ""
+      edited: "",
+      editMode : false
     }
   }
 
-  showForm = (event) => {
-    console.log(event);
-    if (event === "new"){
-      console.log("funziona");
-      return (<ModalWindow type="new"/>)
-    }
-  }
+  editModeController = (e) => {
+    this.setState((prevState) => ({ editMode: !prevState.editMode }));
+  };
 
   handleClick = (e, { i }) => {
     this.setState({ activeItem: e.name,
@@ -50,7 +47,7 @@ class Navbar extends Component {
                         <Icon name="home" size="small"/>
                       </Grid.Column>
                       <Grid.Column>
-                        Home
+                        HOME
                       </Grid.Column>
                     </Grid.Row>
                   </Grid>
@@ -69,20 +66,21 @@ class Navbar extends Component {
                       >
                       <Grid>
                         <Grid.Row>
-                          <Grid.Column width={1}>
+                          <Grid.Column>
                             <Icon name={e.icon} size="small"/>
                           </Grid.Column>
-                          <Grid.Column width={12}>
+                          <Grid.Column width={8}>
                             {e.name}
                           </Grid.Column>
-                          <Grid.Column width={1}>
-                            <Icon name="pencil" size="small"/>
+                          <Grid.Column floated="right">
+                          {this.state.edit ?
+                            <ModalWindow type="modify" idRoom={e} modifyRoom={this.props.updateRoom} deleteRoom={this.props.deleteRoom}/>
+                            : null
+                          }
                           </Grid.Column>
                         </Grid.Row>
                       </Grid>
-
                       </ Menu.Item>
-
                      )
                    }) : null
                   }
@@ -91,11 +89,10 @@ class Navbar extends Component {
                     name='newM'
                     active={activeItem === 'Plus'}
                   >
+
                   <Grid>
-                    <Grid.Row centered onClick={this.showForm} name='new'>
-
+                    <Grid.Row centered name='new'>
                       <ModalWindow type="new" addRoom={this.props.addRoom}/>
-
                     </Grid.Row>
                   </Grid>