diff --git a/Assets/LoadLevelScript.cs b/Assets/LoadLevelScript.cs
@@ -5,54 +5,50 @@
 [ExecuteInEditMode]
 public class LoadLevelScript : MonoBehaviour
 {
-	[Serializable]
-	public class Level
-	{
-		[ShowOnly] public string Name;
-		[ShowOnly] public string Path;
-		public Level(string name, string path)
-		{
-			Name = name;
-			Path = path;
-		}
-	};
-
-	public Level LoadedLevel;
-	public List<Level> Levels = new List<Level>();
+	public GameObject LoadedLevel;
+	public List<GameObject> Levels = new List<GameObject>();
 
 	void OnEnable()
 	{
-		Levels = Game.Instance.IOManager.GetLevelsInDirectory(Application.dataPath + "/Levels/");		
+		Levels = Game.Instance.IOManager.GetLevelsInDirectory(Application.dataPath + "/Levels/");
 		LoadedLevel = null;
 	}
 	void Start()
 	{
-
 	}
-
+	public void CreateLevel()
+	{
+		LoadedLevel = Game.Instance.IOManager.Create();
+		UpdateLevelListAndSetCurrent(LoadedLevel.GetComponent<LevelBase>().Path);
+	}
 	public void LoadSelectedLevel()
 	{
-		Game.Instance.IOManager.Load(LoadedLevel.Path);
+		Game.Instance.IOManager.Load(LoadedLevel.GetComponent<LevelBase>().Path);
 	}
 	public void SaveSelectedLevel()
 	{
-		if(LoadedLevel.Name != null)
+		if(LoadedLevel.GetComponent<LevelBase>().Name != null)
 		{
-			Game.Instance.IOManager.SaveFromPath(LoadedLevel.Path);
+			Game.Instance.IOManager.SaveFromPath(LoadedLevel.GetComponent<LevelBase>().Path);
 			return;
 		}
 		string path = Game.Instance.IOManager.SaveAndGetPath();
+		UpdateLevelListAndSetCurrent(path);
+	}
+
+	private void UpdateLevelListAndSetCurrent(string path)
+	{
 		int index = path.LastIndexOf('/');
 		path = path.Substring(index + 1);
 		Levels = Game.Instance.IOManager.GetLevelsInDirectory(Application.dataPath + "/Levels/");	
-		foreach(Level l in Levels)
+		foreach(GameObject l in Levels)
 		{
-			if(path == l.Name)
+			if(path == l.GetComponent<LevelBase>().Name)
 			{
 				LoadedLevel = l;
 				return;
 			}
-		}
+		}	
 	}
 }
 

diff --git a/Assets/MapEditor.cs b/Assets/MapEditor.cs
@@ -63,26 +63,28 @@ void Update ()
 					m_menuOpen = false;
 					return;
 				}
-				if( Input.mousePosition.y > Screen.height - (Screen.height * 0.08f))
+				if(Input.mousePosition.y > Screen.height - (Screen.height * 0.08f))
 				{
 					m_markedCell = null;
 					m_menuOpen = false;
 					return;
 				}
 
-				GameObject grid = GameObject.Find("Grid");
-				Grid gridComponent = grid.GetComponent<Grid>();
-
-				Vector2 screenPos = new Vector2(Input.mousePosition.x, Input.mousePosition.y);
-				GridCell cell = gridComponent.GetCellFromScreenPosition(screenPos);
-				if(cell != null)
+				GameObject loadedLevel = GetComponent<LoadLevelScript>().LoadedLevel;
+				if(loadedLevel)
 				{
-					if(!m_menuOpen)
+					Grid gridComponent = loadedLevel.GetComponent<Grid>();
+					Vector2 screenPos = new Vector2(Input.mousePosition.x, Input.mousePosition.y);
+					GridCell cell = gridComponent.GetCellFromScreenPosition(screenPos);
+					if(cell != null)
 					{
-						m_markedCell = cell;
-						OpenBlockClickMenu(screenPos);						
-					}
-				}					
+						if(!m_menuOpen)
+						{
+							m_markedCell = cell;
+							OpenBlockClickMenu(screenPos);						
+						}
+					}							
+				}
 			}
 		}
 		else
@@ -94,45 +96,48 @@ void Update ()
 					return;
 				}
 
-				GameObject grid = GameObject.Find("Grid");
-				Grid gridComponent = grid.GetComponent<Grid>();
-				Vector2 screenPos = new Vector2(Input.mousePosition.x, Input.mousePosition.y);
-				GridCell cell = gridComponent.GetCellFromScreenPosition(screenPos);
-				if(cell != null)
+				GameObject loadedLevel = GetComponent<LoadLevelScript>().LoadedLevel;
+				if(loadedLevel)
 				{
-					if(cell != m_lastDrawnCell)
+					Grid gridComponent = loadedLevel.GetComponent<Grid>();
+					Vector2 screenPos = new Vector2(Input.mousePosition.x, Input.mousePosition.y);
+					GridCell cell = gridComponent.GetCellFromScreenPosition(screenPos);
+					if(cell != null)
 					{
-						m_lastDrawnCell = cell;
-						BlockBase block = null;
-
-						switch(m_drawMode)
+						if(cell != m_lastDrawnCell)
 						{
-						case EditorDrawMode.DrawEmpty:
-							break;
-						case EditorDrawMode.DrawMovable:
-							block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.Movable);
-							break;
-						case EditorDrawMode.DrawNonMovable:
-							block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.NonMovable);
-							break;
-						case EditorDrawMode.DrawBoost:
-							block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.PowerUp);
-							break;
-						case EditorDrawMode.DrawLaneChangerLeft:
-							block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.LaneChangerLeft);
-							break;
-						case EditorDrawMode.DrawLaneChangerRight:
-							block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.LaneChangerRight);
-							break;
-						}
-						if(block != null)
-							block.transform.position = cell.GetPosition();
+							m_lastDrawnCell = cell;
+							BlockBase block = null;
 
-						if(cell.GetBlock() != null)
-							Game.Instance.ObjectPool.AddToPool(cell.GetBlock().gameObject);	
-
-						cell.SetBlock(block);
-						gridComponent.SetIsSaved(false);
+							switch(m_drawMode)
+							{
+							case EditorDrawMode.DrawEmpty:
+								break;
+							case EditorDrawMode.DrawMovable:
+								block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.Movable);
+								break;
+							case EditorDrawMode.DrawNonMovable:
+								block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.NonMovable);
+								break;
+							case EditorDrawMode.DrawBoost:
+								block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.PowerUp);
+								break;
+							case EditorDrawMode.DrawLaneChangerLeft:
+								block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.LaneChangerLeft);
+								break;
+							case EditorDrawMode.DrawLaneChangerRight:
+								block = BlockFactory.Instance.CreateBlock(BlockBase.BlockProperty.LaneChangerRight);
+								break;
+							}
+							if(block != null)
+								block.transform.position = cell.GetPosition();
+
+							if(cell.GetBlock() != null)
+								Game.Instance.ObjectPool.AddToPool(cell.GetBlock().gameObject);	
+
+							cell.SetBlock(block);
+							gridComponent.SetIsSaved(false);
+						}
 					}
 				}
 			}
@@ -175,21 +180,24 @@ void ShowRightClickMenu(int windowId)
 		{
 			if(GUI.Button(new Rect((m_menuRect.width * 0.5f) - 70f, 40f + (spacing * i), boxWidth, 20), ((BlockBase.BlockProperty)i).ToString()))
 			{
-				GameObject grid = GameObject.Find("Grid");
-				Grid gridComponent = grid.GetComponent<Grid>();
+				GameObject loadedLevel = GetComponent<LoadLevelScript>().LoadedLevel;
+				if(loadedLevel)
+				{
+					Grid gridComponent = loadedLevel.GetComponent<Grid>();
 
-				BlockBase block = BlockFactory.Instance.CreateBlock(((BlockBase.BlockProperty)i));
-				if(block != null)
-					block.transform.position = m_markedCell.GetPosition();
+					BlockBase block = BlockFactory.Instance.CreateBlock(((BlockBase.BlockProperty)i));
+					if(block != null)
+						block.transform.position = m_markedCell.GetPosition();
 
-				if(m_markedCell.GetBlock() != null)
-					Game.Instance.ObjectPool.AddToPool(m_markedCell.GetBlock().gameObject);	
+					if(m_markedCell.GetBlock() != null)
+						Game.Instance.ObjectPool.AddToPool(m_markedCell.GetBlock().gameObject);	
 
-				m_markedCell.SetBlock(block);
-				gridComponent.SetIsSaved(false);
-				m_menuOpen = false;
-				m_markedCell = null;
-				return;
+					m_markedCell.SetBlock(block);
+					gridComponent.SetIsSaved(false);
+					m_menuOpen = false;
+					m_markedCell = null;
+					return;
+				}
 			}				
 		}
 		if(GUI.Button(new Rect((m_menuRect.width * 0.5f) - 70, 40 + (spacing * (int)BlockBase.BlockProperty.TotalAmountOfTypes), 140, 20), "Cancel"))

diff --git a/Assets/Resources/Prefabs/Levels.meta b/Assets/Resources/Prefabs/Levels.meta
diff --git a/Assets/Resources/Prefabs/Levels/EmptyLevel.prefab b/Assets/Resources/Prefabs/Levels/EmptyLevel.prefab
diff --git a/Assets/Resources/Prefabs/Levels/EmptyLevel.prefab.meta b/Assets/Resources/Prefabs/Levels/EmptyLevel.prefab.meta
diff --git a/Assets/Resources/Prefabs/System.meta b/Assets/Resources/Prefabs/System.meta
diff --git a/Assets/Resources/Prefabs/System/GameObjectPool.prefab b/Assets/Resources/Prefabs/System/GameObjectPool.prefab
diff --git a/Assets/Resources/Prefabs/System/GameObjectPool.prefab.meta b/Assets/Resources/Prefabs/System/GameObjectPool.prefab.meta
diff --git a/Assets/Resources/Prefabs/System/IOManager.prefab b/Assets/Resources/Prefabs/System/IOManager.prefab
diff --git a/Assets/Resources/Prefabs/System/IOManager.prefab.meta b/Assets/Resources/Prefabs/System/IOManager.prefab.meta
diff --git a/Assets/Resources/Prefabs/UI/EditorMenu.prefab b/Assets/Resources/Prefabs/UI/EditorMenu.prefab
diff --git a/Assets/Scenes/assets.unity b/Assets/Scenes/assets.unity