Merge pull request #1 from guywithnose/master

Use current host name for redirect url
UI
Merge pull request #2 from toldavidorick/master

UI