Fix for #58: further UI modifications