Remove dropdowns and tidy up drawer