Include some modal override parameters, and better styling for cmb