Revert "Improved pane options."

This reverts commit 5184e1a5361f46086cb26ea81075933d24198dc8.
Got all the right filters in.
Merge branch 'master' into test