Resumit the site

Strong changes, update controlers.