Added TODO items.
Fixed grid classes.