Issue #2215747 by Mark Carver: Refactor bootstrap dropdowns.