Better dropdown formatting from @acochran