3 OS Layout Improvements