+some changes in view and redirects