Move one redirect to view function. Minor edits to function calling conventions