T697 ui tweaks

Fixes #697