Organized the fill select dropdown with optgroup. Looks way better now