Some changes in View.py