Better dropdowns and cleanups