UI Enhancements on flow diagram