Issue #114 - Polish UI according to spec.