initial grid layout
finished grid layout, organized code a bit, removed some comments
I'm bad at git
Merge branch 'test_grid_layout'
I'm really bad at git. I think it's fixed now....