UI niceties for the fix for issue #49