UPDATE new template, full clean (currently js errors)