Implement UI changes discussed with Jan.

Fixes #785
Fixes #782
Fixes #781