Cleaned up and commented code
Fixed notification
Merged 3 views.py