changes in views and bug fix