Refactor the redirect views

and fix the broken-ness