Restructured the layout for dropdowns