Fix urls and views