Adding first working mapping of history components
Change to field widths and heights for measurements