Added Rectangles to handle position and size