Various updates
Revise member options to make swim / dive fee display optional