Feature/fix scenario view reset