Completed main part of the redesign.