Minor UI enhancements

As I haven't been active of late, someone probably might want to chime
in on these changes :)