UI improvements and update handler generalization