diff --git a/Assets/InputManagerScript.cs b/Assets/InputManagerScript.cs
index ea430d7..1e324e0 100644
--- a/Assets/InputManagerScript.cs
+++ b/Assets/InputManagerScript.cs
@@ -90,15 +90,15 @@ public class InputManagerScript : MonoBehaviour {
 					unitSelected = true;
 					showActions = true;
 					GameObject canv = GameObject.Find ("Canvas");
-					images [0] = Instantiate (imageMove);
+					images [0] = Instantiate (imageAttack);
 					images[0].transform.SetParent (canv.transform, false);
-					images [0].transform.position = new Vector3 (20, 0, 20);
-					images[1] = Instantiate (imageAttack);
+					images [0].transform.position = new Vector3 (50, 0, 50);
+					images[1] = Instantiate (imageMove);
 					images[1].transform.SetParent (canv.transform, false);
-					images [1].transform.position = new Vector3 (40, 0, 20);
+					images [1].transform.position = new Vector3 (100, 0, 50);
 					images[2] = Instantiate (imageEndTurn);
 					images[2].transform.SetParent (canv.transform, false);
-					images [2].transform.position = new Vector3 (60, 0, 20);
+					images [2].transform.position = new Vector3 (150, 0, 50);
 
 				} else {
 					changeCursorColor (Color.red);
diff --git a/Assets/TurnManagerScript.cs b/Assets/TurnManagerScript.cs
index 22378a6..24a84db 100644
--- a/Assets/TurnManagerScript.cs
+++ b/Assets/TurnManagerScript.cs
@@ -79,11 +79,12 @@ public class TurnManagerScript : MonoBehaviour {
 
 	public void moveTo(GameObject go, int i, int j) {
 		UnitBehaviour ub = go.GetComponent<UnitBehaviour> ();
+		ub.moveAct ();
 		int pi = (int)go.transform.position.z;
 		int pj = (int)go.transform.position.x;
 		List<position> movement = getPathBFS (pi, pj, i, j);
 		//TODO: MOVEMENT
-		ub.moveAct ();
+
 		if (ub.remainingActions == 0)
 			actualNumFinishedChars += 1;
 		//Move the unit
@@ -91,6 +92,7 @@ public class TurnManagerScript : MonoBehaviour {
 		//Update matrices
 		unitMap.SetValue(null, pi, pj);
 		unitMap.SetValue(go, i, j);
+		ub.stopMoveAct ();
 	}
 
 	public void attackTo(GameObject go, int i, int j) {