Added UI fixes to the dropdowns and passing the data to the server