Fix Scenario Dialog Order Issue and ListItem Recycle Issue