Fixed broken Url resolution
Changes to UI events