careers page done and fix other pages issues
merge conflict