Issue #21. Various UI updates.