More dropdowns added and foreign key IDs removed