Changes in views
Conflict resolved