Add screen selecting feature