Fix for #58: further UI modifications

Fix for #58: further UI modifications
Why are those lines commented out? They don’t look like a comment to me :-)