Integrated Dan's updates into mine

There was a conflict in gridpak.css, but I resolved our fomatting.