fixed urls and file locations