Updated UI / UX. Added support for redirection