Major design fixes and a few content changes.