Updated to include both styles of options - value with and without display