Minor improvements to user interface