Added dropdowns and removed badges