UI tweaks following comments from jteich