40.11 layout, osx fix