Beefing up UI for #36