Big UX enhancements for manual trigger