Modify base views
Add redirectTo
Clean up some base code