minor UI tweaks and solution for #385