added grid, improved organization, minor tweaks