UI fixup
Some changes:
moved to the .net 4.0 with preserving the async/await capabilities
UI changes