#38 Improvements on State Machine User Diagram