Fixed error in last 3-way merge.
Moved RectangleLayout... Sorry eric :P