Tidied up CustomButton code.
Renamed CustomButton to FilterButton.