Added None options for dropdowns