some changes in views structure