Fix basic templates
Fix welcome page
Fix updated job