Added squares (shift+click) and rectangles instead of simple lines (more
stable)