Updated for Redirector 2.0 + many (UI) fixes and new features