Layout corrections + some tag headers for data input