Fix for #58: further UI modifications

Fix for #58: further UI modifications