Finished the new redesign
Merge the site redesign with the main site