diff --git a/GoldWars/GoldWars/Entities/HUD.swift b/GoldWars/GoldWars/Entities/HUD.swift
index fc3d53f..a66fdc6 100644
--- a/GoldWars/GoldWars/Entities/HUD.swift
+++ b/GoldWars/GoldWars/Entities/HUD.swift
@@ -51,51 +51,7 @@ class HUD: GKEntity {
         roundTimerLabel.horizontalAlignmentMode = .center
         
         self.roundTimer = RoundTimer()
-        
-        leaveGame = ButtonNode(textureName: "exitButton", text: "" , isEnabled: true, position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.05, y: EntityManager.gameEMInstance.scene.size.height * 0.11), onButtonPress: {
-                EntityManager.gameEMInstance.add(Modal(modaltype: .QuitGame, base: nil, anchorPoint: CGPoint(x: EntityManager.gameEMInstance.scene.size.width / 2 , y: EntityManager.gameEMInstance.scene.size.height / 2), gameScene: EntityManager.gameEMInstance.scene, currentDraggedBase: nil, touchLocation: nil, collisionBase: nil))
-        })
-        leaveGame.size = CGSize(width: 120, height: 120);
-        spySkill = SkillButtonNode(
-            textureName: "spy_button",
-            text: "Spy",
-            isEnabled: true,
-            cooldown: 3,
-            position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.81, y: EntityManager.gameEMInstance.scene.size.height * 0.1),
-            onButtonPress: {
-                EntityManager.gameEMInstance.getOpponentBases(for: EntityManager.gameEMInstance.getTeam()).forEach({base in base.component(ofType: TeamComponent.self)?.unitcountLabel.text = "\(base.unitCount)"})
-                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100)
-                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.spy.ten", increasePercentComplete: 10)
-                SoundManager.sharedInstance.playSoundEffect(pathToFile: "use_boost",fileExtension: "wav",volumeLevel: 0.0)
-        }
-        )
-        defSkill = SkillButtonNode(
-            textureName: "def_button",
-            text: "Def",
-            isEnabled: true,
-            cooldown: 4,
-            position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.88, y: EntityManager.gameEMInstance.scene.size.height * 0.1),
-            onButtonPress: {
-                DataService.sharedInstance.localRoundData.hasDefenceBoost = true
-                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100)
-                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.def.ten", increasePercentComplete: 10)
-                SoundManager.sharedInstance.playSoundEffect(pathToFile: "use_boost",fileExtension: "wav",volumeLevel: 0.0)
-        }
-        )
-        atkSkill = SkillButtonNode(
-            textureName: "atk_button",
-            text: "Atk",
-            isEnabled: true,
-            cooldown: 4,
-            position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.74, y: EntityManager.gameEMInstance.scene.size.height * 0.1),
-            onButtonPress: {
-                DataService.sharedInstance.localRoundData.hasAttackBoost = true
-                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100)
-                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.atk.ten", increasePercentComplete: 10)
-                SoundManager.sharedInstance.playSoundEffect(pathToFile: "use_boost",fileExtension: "wav",volumeLevel: 0.0)
-        }
-        )
-        
+
         finishButton = SingeClickButtonNode(
             textureName: "finish_button",
             text: "",
@@ -105,8 +61,50 @@ class HUD: GKEntity {
                 y: EntityManager.gameEMInstance.scene.size.height * 0.1),
             onButtonPress: { }
         )
+        leaveGame = ButtonNode(textureName: "exitButton", text: "" , isEnabled: true, position: CGPoint(x: EntityManager.gameEMInstance.scene.size.width * 0.05, y: EntityManager.gameEMInstance.scene.size.height * 0.11), onButtonPress: {
+                EntityManager.gameEMInstance.add(Modal(modaltype: .QuitGame, base: nil, anchorPoint: CGPoint(x: EntityManager.gameEMInstance.scene.size.width / 2 , y: EntityManager.gameEMInstance.scene.size.height / 2), gameScene: EntityManager.gameEMInstance.scene, currentDraggedBase: nil, touchLocation: nil, collisionBase: nil))
+        })
+        leaveGame.size = CGSize(width: 120, height: 120);
 
-        
+        defSkill = SkillButtonNode(
+            textureName: "def_button",
+            text: "Def",
+            isEnabled: true,
+            cooldown: 4,
+            position: CGPoint(x: finishButton.position.x - 85, y: finishButton.position.y),
+            onButtonPress: {
+                DataService.sharedInstance.localRoundData.hasDefenceBoost = true
+                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100)
+                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.def.ten", increasePercentComplete: 10)
+                SoundManager.sharedInstance.playSoundEffect(pathToFile: "use_boost",fileExtension: "wav",volumeLevel: 0.0)
+        }
+        )
+        spySkill = SkillButtonNode(
+            textureName: "spy_button",
+            text: "Spy",
+            isEnabled: true,
+            cooldown: 3,
+            position: CGPoint(x: defSkill.position.x - 85, y: defSkill.position.y),
+            onButtonPress: {
+                EntityManager.gameEMInstance.getOpponentBases(for: EntityManager.gameEMInstance.getTeam()).forEach({base in base.component(ofType: TeamComponent.self)?.unitcountLabel.text = "\(base.unitCount)"})
+                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100)
+                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.spy.ten", increasePercentComplete: 10)
+                SoundManager.sharedInstance.playSoundEffect(pathToFile: "use_boost",fileExtension: "wav",volumeLevel: 0.0)
+        }
+        )
+        atkSkill = SkillButtonNode(
+            textureName: "atk_button",
+            text: "Atk",
+            isEnabled: true,
+            cooldown: 4,
+           position: CGPoint(x: spySkill.position.x - 85, y: spySkill.position.y),
+            onButtonPress: {
+                DataService.sharedInstance.localRoundData.hasAttackBoost = true
+                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.first.time", increasePercentComplete: 100)
+                GameCenterManager.sharedInstance.addAchievementProgress(identifier: "de.hft.stuttgart.ip2.goldwars.skill.atk.ten", increasePercentComplete: 10)
+                SoundManager.sharedInstance.playSoundEffect(pathToFile: "use_boost",fileExtension: "wav",volumeLevel: 0.0)
+        }
+        )
         finishButton.size = CGSize(width: 100, height: 100)
         finishButton.zPosition = 2
         
@@ -121,7 +119,6 @@ class HUD: GKEntity {
         blockWholeScreenPane.isHidden = true
         super.init()
         initRoundInfo(size: size)
-        
         finishButton.onButtonPress = { [unowned self] in
             self.finishRound()
         }
@@ -133,7 +130,6 @@ class HUD: GKEntity {
         hostUnitsLabel.position = CGPoint(x: size.width * 0.05, y: size.height * 0.9)
         peerUnitsLabel.position = CGPoint(x: size.width * 0.95, y: size.height * 0.9)
         setColor(labelNodes: [hostLabel,hostUnitsLabel,peerLabel,peerUnitsLabel])
-        
         roundTimer.initTimer()
         startWithDuration()
     }
@@ -169,7 +165,7 @@ class HUD: GKEntity {
     
     func initRoundInfo(size: CGSize) -> () {
         backgroundRoundCounter.zPosition = 2
-        backgroundRoundCounter.position = CGPoint(x: Double(size.width) * 0.095, y: Double(size.height)  * 0.11)
+        backgroundRoundCounter.position = CGPoint(x: leaveGame.position.x + 63, y: leaveGame.position.y)
         backgroundRoundCounter.size = CGSize(width: 120, height: 120)
         currentRoundLabel.text = "\(RoundCalculatorService.sharedInstance.currentRound)"
         currentRoundLabel.fontSize = 50