Gui refoctoring again, added rectangle geometry object.