WIP Rect
Added Rectangle.

Layout is still a mess...