Finished cleanup on layout selector in content module.
Patched parameters module to use uikit forms.