Small update to UI functions