Decoupled a few redirect views. Change few bugs