fixed urls and routes