Synchronized main and test pages.

About to rework 960px grid
Reworking HTML/CSS