Add evidence controller and fix condition picker