diff --git a/todolist/fxui/src/main/java/todolist/ui/TodoModelStorage.java b/todolist/fxui/src/main/java/todolist/ui/TodoModelStorage.java
index 73fac7134f70093cf8dea2a061415a7fde7f05df..4c987183af15643780735baed224dbab8b4023d6 100644
--- a/todolist/fxui/src/main/java/todolist/ui/TodoModelStorage.java
+++ b/todolist/fxui/src/main/java/todolist/ui/TodoModelStorage.java
@@ -3,6 +3,7 @@ package todolist.ui;
 import fxutil.doc.AbstractDocumentStorage;
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -33,4 +34,9 @@ public class TodoModelStorage extends AbstractDocumentStorage<TodoModel, File> {
       todoPersistence.writeTodoModel(todoModel, writer);
     }
   }
+
+  @Override
+  protected InputStream toInputStream(final File location) throws IOException {
+    return toFileInputStream((File) location);
+  }
 }
diff --git a/todolist/fxui/src/main/resources/todolist/ui/TodoApp.fxml b/todolist/fxui/src/main/resources/todolist/ui/TodoApp.fxml
index ee9e796af69a61f9771d546abb3f1ab122e0096f..94e4e55b9decf25280076d00f7382261739bfaba 100644
--- a/todolist/fxui/src/main/resources/todolist/ui/TodoApp.fxml
+++ b/todolist/fxui/src/main/resources/todolist/ui/TodoApp.fxml
@@ -3,8 +3,6 @@
 <?import java.lang.String?>
 <?import javafx.scene.layout.VBox?>
 
-<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?>
-
 <VBox xmlns:fx="http://javafx.com/fxml/1" fx:controller="todolist.ui.TodoAppController">
     <fx:define>
         <String fx:id="userTodoModelPath" fx:value="todomodel.json"/>
diff --git a/todolist/fxui/src/main/resources/todolist/ui/TodoDocumentApp.fxml b/todolist/fxui/src/main/resources/todolist/ui/TodoDocumentApp.fxml
index 614c1fd67010d55f2c131c3a91703d3327cbd6b2..8c81f6c0ade976c3fd28da7bdcc750db1c690cae 100644
--- a/todolist/fxui/src/main/resources/todolist/ui/TodoDocumentApp.fxml
+++ b/todolist/fxui/src/main/resources/todolist/ui/TodoDocumentApp.fxml
@@ -4,8 +4,6 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.control.MenuBar?>
 
-<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?>
-
 <BorderPane xmlns:fx="http://javafx.com/fxml/1" fx:controller="todolist.ui.TodoDocumentAppController">
     <fx:define>
         <String fx:id="userAppConfigPath" fx:value="todo-config.toml"/>
diff --git a/todolist/fxui/src/main/resources/todolist/ui/TodoList.fxml b/todolist/fxui/src/main/resources/todolist/ui/TodoList.fxml
index 483bb8409b7cdf511325797ccbfbb7ca165e3088..9250b43e9af0e526014e4f577643b98f41113ea7 100644
--- a/todolist/fxui/src/main/resources/todolist/ui/TodoList.fxml
+++ b/todolist/fxui/src/main/resources/todolist/ui/TodoList.fxml
@@ -18,10 +18,10 @@
                 <FontAwesomeIconView glyphName="PLUS" size="18px" glyphStyle="-fx-fill: green" />
             </graphic>
             <tooltip>
-                <Tooltip text="New Item"/>
+                <Tooltip text="New item"/>
             </tooltip>
         </Button>
-        <TextField fx:id="newTodoItemText" promptText="Skriv inn tekst her" onAction="#handleNewTodoItemAction"/>
+        <TextField fx:id="newTodoItemText" promptText="Skriv inn tekst for nytt element" onAction="#handleNewTodoItemAction"/>
     </HBox>
     <ListView fx:id="todoItemsView">
     </ListView>
diff --git a/todolist/fxui/src/main/resources/todolist/ui/TodoModel.fxml b/todolist/fxui/src/main/resources/todolist/ui/TodoModel.fxml
index 5e5d5f95481b87cf2eb1b71ececa71107fa45f00..cd4a3fbedfd2364a4a32260ecb9f9e709ec7b39b 100644
--- a/todolist/fxui/src/main/resources/todolist/ui/TodoModel.fxml
+++ b/todolist/fxui/src/main/resources/todolist/ui/TodoModel.fxml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.String?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.ListView?>
-
-<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?>
 
 <VBox xmlns:fx="http://javafx.com/fxml/1" fx:controller="todolist.ui.TodoModelController">
     <HBox>
diff --git a/todolist/fxui/src/test/resources/todolist/ui/test-todomodel.json b/todolist/fxui/src/test/resources/todolist/ui/test-todomodel.json
index b30d9b39f84bd9f86ad72c30e74adbc0fb9b1e71..d9977e3a4220d86e54e6a9447dff606b33dbe2a5 100644
--- a/todolist/fxui/src/test/resources/todolist/ui/test-todomodel.json
+++ b/todolist/fxui/src/test/resources/todolist/ui/test-todomodel.json
@@ -1,18 +1,13 @@
 {
-    "lists": [
-        {
-            "name": "todo",
-            "deadline": "2020-10-01T14:53:11",
-            "items": [
-                {
-                    "text": "Item 1",
-                    "checked": true
-                },
-                {
-                    "text": "Item 2",
-                    "checked": false
-                }
-            ]
-        }
-    ]
+  "lists" : [ {
+    "name" : "todo",
+    "deadline" : "2020-10-01T14:53:11",
+    "items" : [ {
+      "text" : "Item 1",
+      "checked" : true
+    }, {
+      "text" : "Item 2",
+      "checked" : false
+    } ]
+  } ]
 }
\ No newline at end of file
diff --git a/todolist/fxutil/src/main/java/fxutil/doc/AbstractDocumentStorage.java b/todolist/fxutil/src/main/java/fxutil/doc/AbstractDocumentStorage.java
index 06fded25bcb95070b5220354705fbf84c771fccb..fe6eab305ed3224ca54611dcc83adbb9eb1282d4 100644
--- a/todolist/fxutil/src/main/java/fxutil/doc/AbstractDocumentStorage.java
+++ b/todolist/fxutil/src/main/java/fxutil/doc/AbstractDocumentStorage.java
@@ -116,16 +116,16 @@ public abstract class AbstractDocumentStorage<D, L> implements DocumentStorage<L
    */
   protected abstract InputStream toInputStream(L location) throws IOException;
 
-  protected InputStream toInputStream(final File location) throws IOException {
+  protected InputStream toFileInputStream(final File location) throws IOException {
     return new FileInputStream(location);
   }
 
-  protected InputStream toInputStream(final URL location) throws IOException {
+  protected InputStream toUrlInputStream(final URL location) throws IOException {
     return location.openStream();
   }
 
-  protected InputStream toInputStream(final URI location) throws IOException {
-    return toInputStream(location.toURL());
+  protected InputStream toUrlInputStream(final URI location) throws IOException {
+    return toUrlInputStream(location.toURL());
   }
 
   @Override