Fixed oversight where rect would fill but not clear.
Refactored Grid.