more work on UI patch for bug 920116