diff --git a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-1.png b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-1.png
deleted file mode 100644
index b9ffa3f..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-1.png and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-2.png b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-2.png
deleted file mode 100644
index b9ffa3f..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base-2.png and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base.png b/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base.png
deleted file mode 100644
index b9ffa3f..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/base.png and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-1.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-1.png
new file mode 100644
index 0000000..efa12ed
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-1.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-2.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-2.png
new file mode 100644
index 0000000..efa12ed
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base-2.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base.png
new file mode 100644
index 0000000..efa12ed
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Base.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Contents.json
similarity index 73%
rename from GoldWars/GoldWars/Assets.xcassets/Base.imageset/Contents.json
rename to GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Contents.json
index 721f4c4..a4fdd66 100644
--- a/GoldWars/GoldWars/Assets.xcassets/Base.imageset/Contents.json
+++ b/GoldWars/GoldWars/Assets.xcassets/BaseTexture.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "base.png",
+      "filename" : "Base.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "base-1.png",
+      "filename" : "Base-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "base-2.png",
+      "filename" : "Base-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-1.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-1.png
new file mode 100644
index 0000000..0dc17d6
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-1.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-2.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-2.png
new file mode 100644
index 0000000..0dc17d6
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2-2.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2.png b/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2.png
new file mode 100644
index 0000000..0dc17d6
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Base_2.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Contents.json
similarity index 70%
rename from GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/Contents.json
rename to GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Contents.json
index 72ffd48..f49b770 100644
--- a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/Contents.json
+++ b/GoldWars/GoldWars/Assets.xcassets/BaseTexture_2.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "logo_kante.jpg",
+      "filename" : "Base_2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "logo_kante-1.jpg",
+      "filename" : "Base_2-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "logo_kante-2.jpg",
+      "filename" : "Base_2-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/Contents.json
index a9bd99c..44dc98f 100644
--- a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/Contents.json
+++ b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "PopUpBackground.png",
+      "filename" : "ModalBackground.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "PopUpBackground-1.png",
+      "filename" : "ModalBackground-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "PopUpBackground-2.png",
+      "filename" : "ModalBackground-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-1.png b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-1.png
new file mode 100644
index 0000000..f3e5344
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-1.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-2.png b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-2.png
new file mode 100644
index 0000000..f3e5344
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground-2.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground.png b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground.png
new file mode 100644
index 0000000..f3e5344
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/ModalBackground.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground-1.png b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground-1.png
deleted file mode 100644
index 5236731..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground-1.png and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground-2.png b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground-2.png
deleted file mode 100644
index 5236731..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground-2.png and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground.png b/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground.png
deleted file mode 100644
index 5236731..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/ModalBackground.imageset/PopUpBackground.png and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/Contents.json
index 231694f..5bbf0b1 100644
--- a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/Contents.json
+++ b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/Contents.json
@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "SkyBackground.jpg",
+      "filename" : "SkyBackground.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "SkyBackground-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "SkyBackground-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-1.png b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-1.png
new file mode 100644
index 0000000..a764543
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-1.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-2.png b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-2.png
new file mode 100644
index 0000000..a764543
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground-2.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground.jpg b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground.jpg
deleted file mode 100644
index 8b499d5..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground.jpg and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground.png b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground.png
new file mode 100644
index 0000000..a764543
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/SkyBackground.imageset/SkyBackground.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/Contents.json b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/Contents.json
new file mode 100644
index 0000000..d3320ef
--- /dev/null
+++ b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "red_cross.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/red_cross.png b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/red_cross.png
new file mode 100644
index 0000000..fadb286
Binary files /dev/null and b/GoldWars/GoldWars/Assets.xcassets/UITexture.spriteatlas/red_cross.imageset/red_cross.png differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-1.jpg b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-1.jpg
deleted file mode 100644
index 1ef166f..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-1.jpg and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-2.jpg b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-2.jpg
deleted file mode 100644
index 1ef166f..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante-2.jpg and /dev/null differ
diff --git a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante.jpg b/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante.jpg
deleted file mode 100644
index 1ef166f..0000000
Binary files a/GoldWars/GoldWars/Assets.xcassets/logo_kante.imageset/logo_kante.jpg and /dev/null differ
diff --git a/GoldWars/GoldWars/Components/DefaultBaseComponent.swift b/GoldWars/GoldWars/Components/DefaultBaseComponent.swift
index bc63dbc..9d7df44 100644
--- a/GoldWars/GoldWars/Components/DefaultBaseComponent.swift
+++ b/GoldWars/GoldWars/Components/DefaultBaseComponent.swift
@@ -15,7 +15,7 @@ class DefaultBaseComponent: GKComponent {
     var labelNode : SKLabelNode
     
     init(texture: SKTexture, position: CGPoint) {
-        spriteNode = BaseNode(texture: texture, size: CGSize(width: 80, height: 80))
+        spriteNode = BaseNode(texture: texture, size: CGSize(width: 100, height: 100))
         spriteNode.position = position
         spriteNode.zPosition = 2
         labelNode = SKLabelNode(text: "")
diff --git a/GoldWars/GoldWars/Entities/Base.swift b/GoldWars/GoldWars/Entities/Base.swift
index 817f2d6..947a6c2 100644
--- a/GoldWars/GoldWars/Entities/Base.swift
+++ b/GoldWars/GoldWars/Entities/Base.swift
@@ -32,7 +32,7 @@ class Base: GKEntity{
         super.init()
         
         let spritePos = position
-        addComponent(DefaultBaseComponent(texture: SKTexture(imageNamed: "Base"), position: spritePos))
+        addComponent(DefaultBaseComponent(texture: SKTexture(imageNamed: "BaseTexture"), position: spritePos))
         if(team != nil && player != nil){
             addComponent(TeamComponent(team: team!, player: player!, position: spritePos))
             self.unitCount = 500
diff --git a/GoldWars/GoldWars/Entities/Modal.swift b/GoldWars/GoldWars/Entities/Modal.swift
index 22f92f3..cbfa479 100644
--- a/GoldWars/GoldWars/Entities/Modal.swift
+++ b/GoldWars/GoldWars/Entities/Modal.swift
@@ -28,14 +28,14 @@ class Modal: GKEntity{
         
         let texture = SKTexture(imageNamed:"ModalBackground")
         background = SKSpriteNode(texture: texture, size: texture.size())
-        background.setScale(2)
+        background.setScale(2.4)
         background.position = anchorPoint
         background.zPosition = 3
         
-        closeButton = ButtonNode(textureName: "yellow_cross", text: "", isEnabled: true, position: CGPoint(x: anchorPoint.x + 160, y: anchorPoint.y + 140), onButtonPress: {
+        closeButton = ButtonNode(textureName: "red_cross", text: "", isEnabled: true, position: CGPoint(x: anchorPoint.x + 195, y: anchorPoint.y + 178), onButtonPress: {
             EntityManager.gameEMInstance.removeModal()
         })
-        closeButton.size = CGSize(width: 30, height: 30)
+        closeButton.size = CGSize(width: 26, height: 26)
         closeButton.zPosition = 4
         
         
@@ -50,7 +50,7 @@ class Modal: GKEntity{
             footer = SKLabelNode()
         }
         
-        self.header.position = CGPoint(x: anchorPoint.x, y: anchorPoint.y + 125)
+        self.header.position = CGPoint(x: anchorPoint.x, y: anchorPoint.y + 90)
         self.header.fontName = "HelveticaNeue-Bold"
         self.header.fontSize = 40
         self.header.zPosition = 4
@@ -72,12 +72,12 @@ class Modal: GKEntity{
         
         switch modaltype{
         case .BaseDetails:
-            addComponent(ButtonComponent(textureName: "yellow_button04", text: "Zurück", position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 120), isEnabled: true, onButtonPress: {
+            addComponent(ButtonComponent(textureName: "yellow_button04", text: "Zurück", position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 105), isEnabled: true, onButtonPress: {
                 EntityManager.gameEMInstance.removeModal()
             }))
         case .BaseAttack:
             addComponent(SliderComponent(width: 300, position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 50)))
-            addComponent(ButtonComponent(textureName: "yellow_button04", text: "Senden", position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 120), isEnabled: true, onButtonPress: {
+            addComponent(ButtonComponent(textureName: "yellow_button04", text: "Senden", position: CGPoint(x: anchorPoint.x , y: anchorPoint.y - 105), isEnabled: true, onButtonPress: {
                 self.sendUnits(currentDraggedBase: currentDraggedBase, touchLocation: touchLocation, gameScene: gameScene, collisionBase: collisionBase)
                 EntityManager.gameEMInstance.removeModal()
             }))
diff --git a/GoldWars/GoldWars/SettingsScene.swift b/GoldWars/GoldWars/SettingsScene.swift
index 7d3ad52..306e579 100644
--- a/GoldWars/GoldWars/SettingsScene.swift
+++ b/GoldWars/GoldWars/SettingsScene.swift
@@ -39,7 +39,7 @@ class SettingsScene: SKScene {
                                     }
         }))
         entityManager.add(Button(name: "StopMovingBackground",
-                                 textureName: "",
+                                 textureName: "yellow_button04",
                                  text: "MOVE/STOP",
                                  position: CGPoint(x: self.size.width * 0.6, y: self.size.height / 2 - 100),
                                  onButtonPress: {