OS Layout Fixes

Fixed layouts: some items needed to be inverted