OS layout update and more software things