urls and views improvement