Misc improvements to the user experience