Remove cruft
Improve default expansion
Fix settings for analog DR
Continue with dropdowns