Make build work (only) on Windows
layout improvements