added back show selector in settings
finished show selector
Merge remote-tracking branch 'origin/testing' into beta