Move logic from urls.py to views.py
Change views.py so more generic views are used
Add comments to views