UI improvements for #104