Change for conditionally displayed config items (based on other params), and fix for layout of some config items