Make UI print friendlier

And other little nits