Miscellaneous bug fixes

Minor tweaks to the user interface