Updates for non blocking of UI
More code UI cleanup
Example use of Delegate method
Cleanup of Code