finished grid layout, organized code a bit, removed some comments