Most updated version

4/28/14

Implements grid layout partially.