win compatibility
converted layout to slim
merge