Fix scenario saving issue, replace old scenario tool with new one