Allow rectangle drawing, first implementation of shapes redraw