diff --git a/src/actions/tutorialBuilderActions.js b/src/actions/tutorialBuilderActions.js
index 0a213f4..e7f2c7a 100644
--- a/src/actions/tutorialBuilderActions.js
+++ b/src/actions/tutorialBuilderActions.js
@@ -169,35 +169,37 @@ export const setSubmitError = () => (dispatch, getState) => {
   if(builder.id === undefined || builder.title === ''){
     dispatch(setError(undefined, 'title'));
   }
-  for(var i = 0; i < builder.steps.length; i++){
-    builder.steps[i].id = i+1;
+  builder.steps.map((step, i) => {
+    step.id = i+1;
     if(i === 0){
-      if(builder.steps[i].requirements && builder.steps[i].requirements.length > 0){
-        var requirements = builder.steps[i].requirements.filter(requirement => typeof(requirement)==='number');
-        if(requirements.length < builder.steps[i].requirements.length){
+      if(step.requirements && step.requirements.length > 0){
+        var requirements = step.requirements.filter(requirement => typeof(requirement)==='number');
+        if(requirements.length < step.requirements.length){
           dispatch(changeContent(i, 'requirements', requirements));
         }
       }
-      if(builder.steps[i].hardware === undefined || builder.steps[i].hardware.length < 1){
+      if(step.hardware === undefined || step.hardware.length < 1){
         dispatch(setError(i, 'hardware'));
       }
       else{
         var hardwareIds = data.map(hardware => hardware.id);
-        var hardware = builder.steps[i].hardware.filter(hardware => hardwareIds.includes(hardware));
-        if(hardware.length < builder.steps[i].hardware.length){
+        var hardware = step.hardware.filter(hardware => hardwareIds.includes(hardware));
+        if(hardware.length < step.hardware.length){
           dispatch(changeContent(i, 'hardware', hardware));
         }
       }
     }
-    if(builder.steps[i].headline === undefined || builder.steps[i].headline === ''){
+    if(step.headline === undefined || step.headline === ''){
       dispatch(setError(i, 'headline'));
     }
-    if(builder.steps[i].text === undefined || builder.steps[i].text === ''){
+    if(step.text === undefined || step.text === ''){
       dispatch(setError(i, 'text'));
     }
-  }
+    return null;
+  });
 };
 
+
 export const checkError = () => (dispatch, getState) => {
   dispatch(setSubmitError());
   var error = getState().builder.error;
diff --git a/src/components/Blockly/blocks/sensebox-display.js b/src/components/Blockly/blocks/sensebox-display.js
index 795f295..944a214 100644
--- a/src/components/Blockly/blocks/sensebox-display.js
+++ b/src/components/Blockly/blocks/sensebox-display.js
@@ -2,7 +2,6 @@ import * as Blockly from 'blockly/core';
 import { getColour } from '../helpers/colour';
 import * as Types from '../helpers/types'
 import { FieldSlider } from '@blockly/field-slider';
-import { Field } from '..';
 
 
 Blockly.Blocks['sensebox_display_beginDisplay'] = {
@@ -250,4 +249,4 @@ Blockly.Blocks['sensebox_display_drawRectangle'] = {
         }
     },
     LOOP_TYPES: ['sensebox_display_show'],
-};
\ No newline at end of file
+};
diff --git a/src/reducers/tutorialReducer.js b/src/reducers/tutorialReducer.js
index 66361ba..ef5f433 100644
--- a/src/reducers/tutorialReducer.js
+++ b/src/reducers/tutorialReducer.js
@@ -5,30 +5,29 @@ import tutorials from '../data/tutorials.json';
 const initialStatus = () => {
   if(window.localStorage.getItem('status')){
     var status = JSON.parse(window.localStorage.getItem('status'));
-    var existingTutorialIds = [];
-    for(var i = 0; i < tutorials.length; i++){
-      var tutorialsId = tutorials[i].id
-      existingTutorialIds.push(tutorialsId);
-      if(status.findIndex(status => status.id === tutorialsId) > -1){
-        var tasks = tutorials[i].steps.filter(step => step.type === 'task');
-        var existingTaskIds = [];
-        for(var j = 0; j < tasks.length; j++){
-          var tasksId = tasks[j].id;
-          existingTaskIds.push(tasksId);
-          if(status[i].tasks.findIndex(task => task.id === tasksId) === -1){
+    var existingTutorialIds = tutorials.map((tutorial, i) => {
+      var tutorialsId = tutorial.id;
+      var statusIndex = status.findIndex(status => status.id === tutorialsId);
+      if(statusIndex > -1){
+        var tasks = tutorial.steps.filter(step => step.type === 'task');
+        var existingTaskIds = tasks.map((task, j) => {
+          var tasksId = task.id;
+          if(status[statusIndex].tasks.findIndex(task => task.id === tasksId) === -1){
             // task does not exist
-            status[i].tasks.push({id: tasksId});
+            status[statusIndex].tasks.push({id: tasksId});
           }
-        }
+          return tasksId;
+        });
         // deleting old tasks which do not longer exist
         if(existingTaskIds.length > 0){
-          status[i].tasks = status[i].tasks.filter(task => existingTaskIds.indexOf(task.id) > -1);
+          status[statusIndex].tasks = status[statusIndex].tasks.filter(task => existingTaskIds.indexOf(task.id) > -1);
         }
       }
       else{
-        status.push({id: tutorialsId, tasks: new Array(tutorials[i].steps.filter(step => step.type === 'task').length).fill({})});
+        status.push({id: tutorialsId, tasks: new Array(tutorial.steps.filter(step => step.type === 'task').length).fill({})});
       }
-    }
+      return tutorialsId;
+    });
     // deleting old tutorials which do not longer exist
     if(existingTutorialIds.length > 0){
       status = status.filter(status => existingTutorialIds.indexOf(status.id) > -1);