Added question and helper controls