additional ui improvements for #362