diff --git a/Window.py b/Window.py
index 2a68f1d..65bd458 100644
--- a/Window.py
+++ b/Window.py
@@ -8,6 +8,9 @@ from Line import Line
 from Circle import Circle
 from Connect import Connect
 from XDistance import XDistance
+from YDistance import YDistance
+from Horizontal import Horizontal
+from Vertical import Vertical
 
 class Window:
     def __init__(self, title):
@@ -28,15 +31,20 @@ class Window:
         c = Circle(0, 0, 0.3)
         s.shapes.append(c)
 
+        s.constraints.append(Horizontal(l1, 0, l1, 1))
         s.constraints.append(Connect(l1, 1, l2, 0))
+        s.constraints.append(Vertical(l2, 0, l2, 1))
         s.constraints.append(Connect(l2, 1, l3, 0))
+        s.constraints.append(Horizontal(l3, 0, l3, 1))
         s.constraints.append(Connect(l3, 1, l4, 0))
+        s.constraints.append(Vertical(l4, 0, l4, 1))
         s.constraints.append(Connect(l4, 1, l1, 0))
 
         s.constraints.append(Connect(c, 1, l2, 0))
         s.constraints.append(Connect(c, 4, l3, 1))
 
         s.constraints.append(XDistance(l1, 0, l1, 1, 0.4))
+        s.constraints.append(YDistance(l4, 0, l4, 1, 0.4))
 
         s.solve()