Refactored Redirector
Refactored redirection in UI components.