Separate Mac and Win UI config.
resolve conflict
update