Added Task.WhenAny implementation + UI changes