Fixed Deep linking and code cleanup

This patch will fix the bug #1 'Relay State not working properly' issue. Essentially I was not creating the service correctly to include the deep link and validation was failing.