Revert "Consolidate screen options, control toggle filters with "Show on screen""

This reverts commit a95ccdfe1b5c87c2e444ffb0e506228b0bb5d736.