Redirect and view updates

Change-Id: I4d4ea34b059d37fba2ad4e7e39fd469afeedee6a