Fixing up ui_helpers based on feedback from Christina