diff --git a/ProjectPlane/ProjectPlane/DrawCont.cs b/ProjectPlane/ProjectPlane/DrawCont.cs
index 3ca71d7..d26610b 100644
--- a/ProjectPlane/ProjectPlane/DrawCont.cs
+++ b/ProjectPlane/ProjectPlane/DrawCont.cs
@@ -107,19 +107,22 @@ public class DrawCont
                 return true;
 
             case DirectionType.Right:
-                if (_StartPosX.Value + EntityContainer.Step < _PictureWidth)
+                if (_StartPosX.Value + EntityContainer.Step < _PictureWidth - _drawingContWidth)
                 {
                     _StartPosX += (int)EntityContainer.Step;
                 }
                 return true;
+
             case DirectionType.Up:
+
                 if (_StartPosY.Value - EntityContainer.Step > 0)
                 {
                     _StartPosY -= (int)EntityContainer.Step;
                 }
                 return true;
+
             case DirectionType.Down:
-                if (_StartPosY.Value + EntityContainer.Step < _PictureHeight)
+                if (_StartPosY.Value + EntityContainer.Step < _PictureHeight - _drawingContHeight)
                 {
                     _StartPosY += (int)EntityContainer.Step;
                 }
diff --git a/ProjectPlane/ProjectPlane/EntityContainer.cs b/ProjectPlane/ProjectPlane/EntityContainer.cs
index 4cb381a..5bc1409 100644
--- a/ProjectPlane/ProjectPlane/EntityContainer.cs
+++ b/ProjectPlane/ProjectPlane/EntityContainer.cs
@@ -34,7 +34,7 @@ public class EntityContainer
     /// </summary>
     public bool Crane { get; private set; }
 
-    public double Step => Speed * 100 / Weight;
+    public double Step => Speed * 10 / Weight;
 
     public void Init(int speed, double weight, Color shipColor, Color containerColor, bool container, bool crane)
     {