urls and views improvement
Merge pull request #1 from timjoww/master

urls and views improvement