some changes in views and service