Added new image grid, bunch of bug fixes/tweaks