Refactor of fileterBuilderPanel