Minor fixes to cui policy
Cleanup whitespace in config files