Fix the layout map to accurately reflect my constants.