am f1e8069b: UI tweaks to meet Jeff\'s spec.

Merge commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0' into eclair-mr2

* commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0':
  UI tweaks to meet Jeff's spec.