Cleaned up some select lists and added logic to hide punctuation during the custody flow