Updated Trigger assignment with cleaner UI.