Refactored the drop down values to make selecting auto-detected defaults easier