Minor improvements for UI functionality