diff --git a/motorradig/.idea/workspace.xml b/motorradig/.idea/workspace.xml
index 448fb34..ffcf7bb 100644
--- a/motorradig/.idea/workspace.xml
+++ b/motorradig/.idea/workspace.xml
@@ -3,13 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="eed7de89-f054-487c-bf59-36356758942b" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/FileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/FileController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/js/Icon.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/Icon.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/public/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/app.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/js/store.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/store.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/resources/js/views/Upload.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/Upload.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/js/views/UserList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/UserList.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -275,11 +270,11 @@
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state x="510" y="217" width="881" height="578" key="FileChooserDialogImpl/0.0.1920.1080@0.0.1920.1080" timestamp="1581069660293" />
-    <state x="1730" y="198" key="SettingsEditor" timestamp="1580917895369">
+    <state x="1730" y="198" key="SettingsEditor" timestamp="1581415686371">
       <screen x="1280" y="23" width="1920" height="1057" />
     </state>
     <state x="450" y="179" key="SettingsEditor/0.0.1920.1080@0.0.1920.1080" timestamp="1580731664075" />
-    <state x="1730" y="198" key="SettingsEditor/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1580917895369" />
+    <state x="1730" y="198" key="SettingsEditor/0.23.1280.777/1280.23.1920.1057@1280.23.1920.1057" timestamp="1581415686371" />
     <state x="1280" y="23" width="1720" height="857" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1581075547973">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
diff --git a/motorradig/public/js/app.js b/motorradig/public/js/app.js
index 1ec3587..8c62c78 100644
--- a/motorradig/public/js/app.js
+++ b/motorradig/public/js/app.js
@@ -2147,6 +2147,14 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ __webpack_exports__["default"] = ({
@@ -2162,7 +2170,8 @@ __webpack_require__.r(__webpack_exports__);
         }), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["HorizontalRule"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["ListItem"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["OrderedList"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["TodoItem"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["TodoList"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Link"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Bold"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Code"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Italic"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Strike"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["Underline"](), new tiptap_extensions__WEBPACK_IMPORTED_MODULE_1__["History"]()]
       }),
       //folders: this.$store.state.folders
-      folders: ['Folder1', 'Folder2']
+      folders: ['Folder1', 'Folder2'],
+      selectedFolder: this.$store.state.selectedFolder
     };
   },
   beforeDestroy: function beforeDestroy() {
@@ -2215,6 +2224,8 @@ __webpack_require__.r(__webpack_exports__);
       });
     },
     createFolderRequest: function createFolderRequest(event) {
+      var _this2 = this;
+
       var folderName = event.target.value;
       console.log("Request creation of folder:" + folderName);
       var formData = new FormData();
@@ -2226,11 +2237,14 @@ __webpack_require__.r(__webpack_exports__);
         }
       }).then(function (res) {
         console.log(res.data);
-        loadFolders();
+
+        _this2.$store.state.folders.push(folderName);
+
+        _this2.$store.state.selectedFolder = folderName;
       });
     },
     loadFolders: function loadFolders() {
-      var _this2 = this;
+      var _this3 = this;
 
       console.log("Requesting folders");
       axios.post('http://localhost:8000/api/v1/auth/get_folders', {}, {
@@ -2240,7 +2254,7 @@ __webpack_require__.r(__webpack_exports__);
       }).then(function (res) {
         console.log("Receiving folders");
         console.log(res.data.folders);
-        _this2.$store.state.folders = res.data.folders;
+        _this3.$store.state.folders = res.data.folders;
       });
     },
     newFolderSelected: function newFolderSelected(event) {
@@ -31717,17 +31731,6 @@ var render = function() {
           [_vm._v("Log-In")]
         ),
         _vm._v(" "),
-        _c("div", [
-          _c("form", [
-            _c("span", [_vm._v("UPLOAD:")]),
-            _vm._v(" "),
-            _c("input", {
-              attrs: { name: "filename", type: "file" },
-              on: { change: _vm.uploadFile }
-            })
-          ])
-        ]),
-        _vm._v(" "),
         _vm._m(0),
         _vm._v(" "),
         _c("div", { staticStyle: { "background-color": "cyan" } }, [
@@ -31738,17 +31741,32 @@ var render = function() {
           _c("button", [_vm._v("Neuen Ordner erzeugen")])
         ]),
         _vm._v(" "),
-        _c("form", [
-          _c("label", [_vm._v("Ordner wählen:")]),
-          _vm._v(" "),
-          _c(
-            "select",
-            { on: { change: _vm.newFolderSelected } },
-            _vm._l(this.$store.state.folders, function(folder) {
-              return _c("option", [_vm._v(_vm._s(folder))])
-            }),
-            0
-          )
+        _c("label", [_vm._v("Ordner wählen:")]),
+        _vm._v(" "),
+        _c(
+          "select",
+          { on: { change: _vm.newFolderSelected } },
+          _vm._l(this.$store.state.folders, function(folder) {
+            return _c(
+              "option",
+              {
+                domProps: { selected: folder.localeCompare(_vm.selectedFolder) }
+              },
+              [_vm._v(_vm._s(folder))]
+            )
+          }),
+          0
+        ),
+        _vm._v(" "),
+        _c("div", [
+          _c("form", [
+            _c("span", [_vm._v("UPLOAD:")]),
+            _vm._v(" "),
+            _c("input", {
+              attrs: { name: "filename", type: "file" },
+              on: { change: _vm.uploadFile }
+            })
+          ])
         ])
       ],
       1
diff --git a/motorradig/public/upload/images/Papa_Schlumpf/Gazprom.png b/motorradig/public/upload/images/Papa_Schlumpf/Gazprom.png
new file mode 100644
index 0000000..9757b40
Binary files /dev/null and b/motorradig/public/upload/images/Papa_Schlumpf/Gazprom.png differ
diff --git a/motorradig/resources/js/views/Upload.vue b/motorradig/resources/js/views/Upload.vue
index f88df77..d652c84 100644
--- a/motorradig/resources/js/views/Upload.vue
+++ b/motorradig/resources/js/views/Upload.vue
@@ -27,12 +27,7 @@
 
 
 
-            <div>
-                <form>
-                    <span>UPLOAD:</span>
-                    <input name="filename" type="file" @change="uploadFile"></input>
-                </form>
-            </div>
+
 
             <div style="background-color:darkmagenta;">
                 <p>&nbsp; .....<br/></p>
@@ -44,12 +39,25 @@
 
             </div>
 
-            <form>
+            <!-- <form> -->
                 <label>Ordner wählen:</label>
                 <select @change="newFolderSelected">
-                    <option v-for="folder in this.$store.state.folders">{{ folder }}</option>
+
+
+
+                    <option v-for="folder in this.$store.state.folders" :selected="folder.localeCompare(selectedFolder)">{{ folder }}</option>
                 </select>
-            </form>
+            <!-- </form> -->
+
+
+            <div>
+                <form>
+                    <span>UPLOAD:</span>
+                    <input name="filename" type="file" @change="uploadFile"></input>
+                </form>
+            </div>
+
+
         </div>
 
     </div>
@@ -106,7 +114,8 @@
                     ]
                 }),
                 //folders: this.$store.state.folders
-                folders: ['Folder1','Folder2']
+                folders: ['Folder1','Folder2'],
+                selectedFolder:this.$store.state.selectedFolder
             }
         },
         beforeDestroy() {
@@ -175,7 +184,8 @@
                 })
                     .then(res=>{
                         console.log(res.data);
-                        loadFolders();
+                        this.$store.state.folders.push(folderName);
+                        this.$store.state.selectedFolder=folderName;
                     })
             },
             loadFolders() {