soci msvc build, some layout fixings