Fixed content bug and wrong path bug