diff --git a/.project b/.project
index 573cbe4..2aaee8c 100644
--- a/.project
+++ b/.project
@@ -11,12 +11,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>net.sourceforge.metrics.builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/README.md b/README.md
index 4366ce0..55904f1 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,8 @@ Każdą operacje dotyczącą jednego obiektu należy zakończyć **ID oczekiwane
 Dostępne operacje:
 
 * **building** - Wyświetla informacje o wszystkich elementach,
-* **building/new/** - Dodaje nowy budynek zgodnie z danymi w formacie JSON
+* **GUI/** - Otwiera GUI które pozwala na wprowadzanie nowych budynków do systemu
+* **GUI/new/** - Dodaje nowy budynek zgodnie z danymi w formacie JSON
 * **getRoomArea** - Wyświetla powierzchnię pokoju,
 * **getLevelArea** - Wyświetla powierzchnię poziomu,
 * **getBuildingArea** - Wyświetla powierzchnię budynku,
diff --git a/src/main/java/pl/put/poznan/building_info/logic/BuildingOperations.java b/src/main/java/pl/put/poznan/building_info/logic/BuildingOperations.java
index 95de787..4909f39 100644
--- a/src/main/java/pl/put/poznan/building_info/logic/BuildingOperations.java
+++ b/src/main/java/pl/put/poznan/building_info/logic/BuildingOperations.java
@@ -4,8 +4,11 @@
 import pl.put.poznan.building_info.structures.Location;
 import pl.put.poznan.building_info.structures.Room;
 import pl.put.poznan.building_info.structures.Building;
+import pl.put.poznan.building_info.structures.BuildingContent;
 import pl.put.poznan.building_info.structures.Level;
 import pl.put.poznan.building_info.structures.Collection;
+import pl.put.poznan.building_info.structures.BuildingContent;
+import pl.put.poznan.building_info.structures.LevelContent;
 import pl.put.poznan.building_info.structures.Value;
 import pl.put.poznan.building_info.structures.allLocations;
 import pl.put.poznan.building_info.info.Result;
@@ -77,19 +80,24 @@ public ArrayList<Building> createSomeData(){
 
 //Change new building elements ID's and add building to existing data structures
 
-    public Result addBuilding(Building newBuilding){
+    public Result addBuilding(BuildingContent newBuildingContent){
         int baseID = currentID;
 
+        Building newBuilding = newBuildingContent.getBiuiding();
         newBuilding.setID(currentID);
         currentID ++;
 
-        for (Level level : newBuilding.getLevels()) {
+        for (LevelContent levelContent : newBuildingContent.getLevelContent()) {
+            Level level = levelContent.getLevel();
             level.setID(currentID);
             currentID ++;
+            newBuilding.addLevel(level);
 
-            for (Room room : level.getRooms()) {
+            for (Room room : levelContent.getRooms()) {
                 room.setID(currentID);
+                room.calcParamsAgain();
                 currentID ++;   
+                level.addRoom(room);
             }
         }
 
diff --git a/src/main/java/pl/put/poznan/building_info/rest/BuildingInfoController.java b/src/main/java/pl/put/poznan/building_info/rest/BuildingInfoController.java
index 49de381..d496d79 100644
--- a/src/main/java/pl/put/poznan/building_info/rest/BuildingInfoController.java
+++ b/src/main/java/pl/put/poznan/building_info/rest/BuildingInfoController.java
@@ -7,10 +7,19 @@
 import java.util.Arrays;
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.lang.reflect.Type;
 
 import pl.put.poznan.building_info.structures.Location;
+import pl.put.poznan.building_info.structures.Room;
 import pl.put.poznan.building_info.structures.Building;
+import pl.put.poznan.building_info.structures.BuildingContent;
+import pl.put.poznan.building_info.structures.Level;
+import pl.put.poznan.building_info.structures.LevelContent;
 import pl.put.poznan.building_info.info.Result;
 import pl.put.poznan.building_info.structures.Collection;
 import pl.put.poznan.building_info.structures.Value;
@@ -30,14 +39,42 @@ public class BuildingInfoController {
      param newBuilding JSON format building object
      @return JSON response
      */
-    @RequestMapping(value = "/building/new/", method = RequestMethod.POST, produces = "application/json")
+    @RequestMapping(value = "/GUI/new/", method = RequestMethod.POST, produces = "text/html")
     public String createBuilding(@RequestBody String newBuilding) {
 
+        System.out.println(newBuilding);
         Gson g = new Gson(); 
-        Building newBuildingObj = g.fromJson(newBuilding, Building.class);
-        Result result = transformer.addBuilding(newBuildingObj);
-        g = null;
-        return result.getAsJsonString();
+        BuildingContent newBuildingObj = g.fromJson(newBuilding, BuildingContent.class);
+
+        return transformer.addBuilding(newBuildingObj).getAsJsonString();
+    }
+
+    /**
+     * Open GUI for adding new buildings
+     * @param locationId
+     * @return
+     */
+    @RequestMapping(value = "/GUI/", method = RequestMethod.GET, produces = "text/html")
+    public String GUI(@RequestParam(value = "id", required = false) String locationId) {
+
+        File file = new File("src/main/resources/newBuilding.html");
+        FileInputStream fis;
+        try {
+            fis = new FileInputStream(file);
+            byte[] data = new byte[(int) file.length()];
+            fis.read(data);
+            fis.close();
+            String str = new String(data, "UTF-8");
+            return str;
+        } catch (FileNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return "";
+		}catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return "";
+        }
     }
 
     /**
diff --git a/src/main/java/pl/put/poznan/building_info/structures/BuildingContent.java b/src/main/java/pl/put/poznan/building_info/structures/BuildingContent.java
new file mode 100644
index 0000000..ecd8e00
--- /dev/null
+++ b/src/main/java/pl/put/poznan/building_info/structures/BuildingContent.java
@@ -0,0 +1,25 @@
+package pl.put.poznan.building_info.structures;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BuildingContent{
+	
+    private Building building;
+    private ArrayList<LevelContent> levels = new ArrayList<LevelContent>();
+
+    public BuildingContent(Building b){
+        this.building = b;
+    }
+
+    public void addLevelContent(LevelContent l){
+        levels.add(l);
+    }
+
+    public Building getBiuiding(){
+        return building;
+    }
+    
+    public ArrayList<LevelContent> getLevelContent(){
+        return levels;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/pl/put/poznan/building_info/structures/LevelContent.java b/src/main/java/pl/put/poznan/building_info/structures/LevelContent.java
new file mode 100644
index 0000000..3b327a8
--- /dev/null
+++ b/src/main/java/pl/put/poznan/building_info/structures/LevelContent.java
@@ -0,0 +1,24 @@
+package pl.put.poznan.building_info.structures;
+import java.util.ArrayList;
+import java.util.List;
+
+public class LevelContent{
+    private Level level;
+    private ArrayList<Room> rooms = new ArrayList<Room>();
+
+    public LevelContent(Level l){
+        level = l;
+    }
+
+    public Level getLevel(){
+        return level;
+    }
+
+    public ArrayList<Room> getRooms(){
+        return rooms;
+    }
+
+    public void addRooms(ArrayList<Room> rooms){
+        this.rooms = rooms;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/pl/put/poznan/building_info/structures/Room.java b/src/main/java/pl/put/poznan/building_info/structures/Room.java
index e5b0a3f..f2494a0 100644
--- a/src/main/java/pl/put/poznan/building_info/structures/Room.java
+++ b/src/main/java/pl/put/poznan/building_info/structures/Room.java
@@ -55,6 +55,11 @@ public boolean isRoom(){
         return true;
     }
 
+    public void calcParamsAgain(){
+        this.area = length * width;
+        this.cube = this.area * height;
+    }
+
     /**
      * <p>Zwraca zuzycie energii na ogrzewanie pokoju</p>
      */
diff --git a/src/main/resources/newBuilding.html b/src/main/resources/newBuilding.html
new file mode 100644
index 0000000..8b0d13c
--- /dev/null
+++ b/src/main/resources/newBuilding.html
@@ -0,0 +1,382 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Building Info</title>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+    <link href="https://fonts.googleapis.com/css?family=Staatliches" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro" rel="stylesheet">
+</head>
+
+<style type="text/css">
+  h1, h2{
+      font-family: Staatliches;
+      width: 100%;
+      text-align: left;
+      font-size: 40px;
+      margin-bottom: 0px;
+      margin-left: 25px;
+  }
+
+  h2{
+    font-size: 16px;
+    margin-top: 0px;
+    font-weight: 100;
+  }
+
+#projectName{
+    height: 15%;
+    width: 50%;
+}
+  #tresc,body{
+      width: 100%;
+      height: 100%;
+      margin: 0px;
+      padding: 0px;
+  }
+
+  p{
+    font-family: 'Source Sans Pro', sans-serif;
+    margin: 5px;
+    font-size: 22px;
+  }
+
+  #BuildingName{
+      position: absolute;
+      top: 0px;
+      right: 40px;
+  }
+  #BuildingName h2{
+      margin-top: 30px;
+      font-size: 22px;
+      text-align: right;
+  }
+
+  #BuildingName input{
+      background-color:#CCCCCC;
+      border: 2px solid #333333;
+      font-size: 25px;
+      margin-right: -30px;
+  }
+
+  #levels{
+      position: absolute;
+      left: 0px;
+      top: 15%;
+      width: 30%;
+      height: 85%;
+      cursor: pointer;
+  }
+  
+
+  #rooms{
+      position: absolute;
+      top: 15%;
+      left: 30%;
+      width: 70%;
+      height: 85%;
+  }
+  .level,#addNewLevel{
+      width: 100%;
+      padding-top: 30px;
+      padding-bottom: 30px;
+      margin-top: 10px;
+      background-color: #CCCCCC;
+      text-align: center;
+  }
+  .level{
+      position: relative;
+  }
+  #addNewLevel{
+        background-color: #9FD698;
+        margin-top: 10px;
+        cursor: pointer;
+  }
+
+  h3{
+      font-size: 30px;
+      font-family: Staatliches;
+      font-weight: 100;
+      margin: 0px;
+      padding: 0px;
+  }
+
+  input{
+    font-family: 'Source Sans Pro', sans-serif;
+    font-size: 20px;
+  }
+  .room{
+      outline: 2px solid #333333;
+      width: 32%;
+      margin-top: 10px;
+      margin-left: 1%;
+      height: 350px;
+      border-radius: 10px;
+  }
+
+  .room{
+      padding-top: 15px;
+      position: relative;
+      float: left;
+  }
+  .room p, .room input{
+      font-size: 15px;
+  }
+  .room p{
+      float: left;
+      margin-left: 3%;
+      width: 94%;
+  }
+  .room input{
+      float: right;
+      margin-right: 10px;
+  }
+
+  #addNewRoom{
+    width: 32%;
+      margin-top: 10px;
+      margin-left: 1%;
+      height: 350px;
+      float: left;
+      text-align: center;
+      background-color: #9FD698;
+      cursor: pointer;
+      padding-top: 15px;
+  }
+  #addNewRoom h3{
+      margin-top: 100px;
+  }
+
+  #save{
+      position: fixed;
+      right: 0px;
+      bottom: 0px;
+      width: 300px;
+      height: 100px;
+      border-top: 3px solid #333333;
+      border-left: 3px solid #333333;
+      background-color: #9FD698;
+      cursor: pointer;
+  }
+
+  #save h3{
+      text-align: center;
+      margin-top: 30px;
+  }
+
+  .close{
+      position: absolute;
+      bottom: 5px;
+      right: 5px;
+      font-size: 14px;
+      font-family: Staatliches;
+      font-weight: 100;
+      cursor: pointer;
+  }
+
+  .activeLevel{
+      border: 3px solid #333333;
+  }
+</style>
+
+<body>
+    <div id="projectName">
+        <h1>Building Info</h1>
+        <h2>Add new building</h2>
+    </div>
+
+
+
+<div id="tresc">
+    <div id="BuildingName">
+        <h2>Nazwa budynku</h2>
+        <input type="text" name="name"><br>
+    </div>
+
+    <div id="levels">
+        <div class="level">
+            <p class="close" onclick="removeLevel(event)">Usuń</p>
+            <p>Nazwa poziomu</p>
+            <input type="text" name="name"><br>
+        </div>
+
+        <div id="addNewLevel">
+            <h3>Dodaj nowy poziom</h3>
+        </div>
+    </div>
+    <div id="rooms">
+        <div class="room">
+            <p class="close" onclick="removeRoom(event)">Usuń</p>
+            <p>Nazwa pokoju
+            <input type="text" name="RoomName"></p>
+            <p>Długość
+            <input type="text" name="length"></p>
+            <p>Szerokość
+            <input type="text" name="width"></p>
+            <p>Wysokość
+            <input type="text" name="height"></p>
+            <p>Ogrzewanie
+            <input type="text" name="heating"></p>
+            <p>Moc oświetlenia
+            <input type="text" name="light"></p>
+            <p>Czynsz
+            <input type="text" name="rent"></p>
+        </div>
+        <div id="addNewRoom">
+            <h3>Dodaj nowy pokój</h3>
+        </div>
+    </div>
+
+</div>
+
+<div id="save">
+    <h3>Zapisz zmiany</h3>
+</div>
+
+</body>
+
+
+<script>
+    var levelTeplate = $('.level').clone();
+    $('.level').remove();
+    var roomTeplate = $('.room').clone();
+    $('.room').remove();
+    $('#addNewRoom').hide();
+
+    var levelCount = 0;
+    var activeLevel = null;
+
+    $('#addNewLevel').click(function(){
+        $('#addNewLevel').before(levelTeplate.clone().attr('id','lc'+levelCount).attr('onclick',"levelClick(event, this)"));
+        levelCount++;
+    })
+
+    function levelClick(event, e){
+        activeLevel = $(e).attr('id');
+        $('.level').removeClass('activeLevel');
+        $(e).addClass('activeLevel');
+
+        $('.room').hide();
+        $('.'+activeLevel).show();
+        $('#addNewRoom').show();
+    }
+
+    function removeLevel(e){
+        var idd = $(e.target).parent('.level').attr('id');
+        $('.'+idd).remove();
+        $(e.target).parent('.level').remove();
+        activeLevel = null;
+        $('#addNewRoom').hide();
+        e.stopPropagation();
+    }
+
+    function removeRoom(e){
+        $(e.target).parent('.room').remove();
+        
+    }
+
+    $('#addNewRoom').click(function(){
+        $('#addNewRoom').before(roomTeplate.clone().addClass(activeLevel));
+    })
+
+    $('#save').click(function(){
+
+        var regex = /,$/;
+        var outString = '{"building":{"locations":[],"ID":100,"name":"';
+        var buildingName = $('#BuildingName input').val();
+        if(!buildingName){
+            alert("Nazwa budynku misi być wprowadzona");
+            return;
+        }
+        
+        outString+=buildingName;
+        outString+= '","type":"Building"},"levels":[';
+
+        var res = $('.level').each(function(){
+            outString += '{"level":{"locations":[],"ID":101,"name":"';
+            var levelName = $(this).children('input[name="name"]').val();
+            if(!levelName){
+                alert("Wszystkie nazwy poziomów muszą zostać wprowadzone");
+                return false;
+            }
+            outString += levelName;
+            outString += '","type":"Level"},"rooms":[';
+
+            //ROOMS
+            //{"length":10.0,"width":100.0,"height":2.0,"area":1000.0,"cube":2000.0,"heating":45.0,"lightPower":99.0,"rent":2.0,"ID":103,"name":"r1","type":"Room"},
+
+            var roomClass = $(this).attr('id');
+            var ress = $('.'+roomClass).each(function(){
+                var roomName = $(this).find('input[name="RoomName"]').val();
+                var length = parseFloat($(this).find('input[name="length"]').val());
+                var width = parseFloat($(this).find('input[name="width"]').val());
+                var height = parseFloat($(this).find('input[name="height"]').val());
+                var heating = parseFloat($(this).find('input[name="heating"]').val());
+                var light = parseFloat($(this).find('input[name="light"]').val());
+                var rent = parseFloat($(this).find('input[name="rent"]').val());
+
+                if(!roomName || !length || !width || !height || !heating || !light || !rent){
+                    alert('Wszystkie wartości w polach pokoi muszą zostać uzupełnione');
+                    return false;
+                }
+
+                if(isNaN(length) || isNaN(width) || isNaN(height) || isNaN(heating) || isNaN(light) || isNaN(rent)){
+                    alert('Wartości dłudość, wysokość, szerokość, moc ogrzewania, moc światła i czynsz muszą być numeryczne');
+                    return false;
+                }
+
+                if(length < 0 || width < 0 || height < 0 || heating < 0 || light < 0 || rent < 0){
+                    alert('Wartości muszą być dodatnie');
+                    return false;
+                }
+
+                outString += '{"length":' + length;
+                outString += ',"width":' + width;
+                outString += ',"width":' + width;
+                outString += ',"height":' + height;
+                outString += ',"heating":' + heating;
+                outString += ',"lightPower":' + light;
+                outString += ',"rent":' + rent;
+                outString += ',"ID":' + '100';
+                outString += ',"name":"' + roomName;
+                outString += '","type":"Room"},';
+            })
+
+            if(!ress){
+                return false;
+            }
+
+            
+            outString = outString.replace(regex, '');
+            outString += ']},';
+        })
+
+        if(!res){
+            return false;
+        }
+
+        outString = outString.replace(regex, '');
+
+        outString += ']}';
+
+        console.log(outString);
+        
+    
+        $.ajax('new/', {
+            type: 'post',
+            data: outString,
+            dataType: 'json',
+            contentType: 'application/json',
+            success: function(data) { 
+                console.log('Receive: ' + data); 
+                alert("Poprawnie dodano budynek");
+                location.reload();
+                }
+        });
+
+        
+    })
+</script>
+</html>
\ No newline at end of file
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index cfe4eb1..81ae4fa 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,12 +1,14 @@
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\info\Result.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\structures\Collection.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\structures\LocationGroup.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\rest\BuildingInfoController.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\structures\allLocations.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\structures\Value.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\structures\Building.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\structures\Level.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\app\BuildingInfoApplication.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\logic\BuildingOperations.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\structures\Location.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\main\java\pl\put\poznan\building_info\structures\Room.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\logic\BuildingOperations.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\Level.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\Collection.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\info\Result.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\Value.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\LocationGroup.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\Location.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\app\BuildingInfoApplication.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\Building.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\LevelContent.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\rest\BuildingInfoController.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\Room.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\allLocations.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\main\java\pl\put\poznan\building_info\structures\BuildingContent.java
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
index 41d4e8c..74b00eb 100644
--- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -1,2 +1,2 @@
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\test\java\pl\put\poznan\building_info\BuildingOperationsTest.java
-C:\Users\apasi\OneDrive\Dokumenty\GitHub\Building-inf\src\test\java\pl\put\poznan\building_info\LevelTest.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\test\java\pl\put\poznan\building_info\LevelTest.java
+C:\Users\Kamil\Desktop\IOIO\IO-Building-Info\src\test\java\pl\put\poznan\building_info\BuildingOperationsTest.java