Some changes in views