Fixed layout to match cruorg