backport to .net 2; GUI improvements