removed grid, some styling tweaks
merge